HTML strict vote tree and some css changes

CVS version numbers

danish/vote/howto_follow.wml: 1.6 -> 1.7 
danish/vote/howto_proposal.wml: 1.7 -> 1.8 
danish/vote/index.wml: 1.11 -> 1.12 
danish/vote/1999/index.wml: 1.2 -> 1.3 
danish/vote/1999/vote_0001.wml: 1.4 -> 1.5 
danish/vote/2000/index.wml: 1.2 -> 1.3 
danish/vote/2000/vote_0007.wml: 1.3 -> 1.4 
danish/vote/2001/index.wml: 1.2 -> 1.3 
danish/vote/2001/vote_0001.wml: 1.5 -> 1.6 
danish/vote/2002/index.wml: 1.2 -> 1.3 
danish/vote/2002/stats.wml: 1.1 -> 1.2 
danish/vote/2002/vote_0001.wml: 1.21 -> 1.22 
danish/vote/2003/index.wml: 1.2 -> 1.3 
danish/vote/2003/vote_0001.wml: 1.20 -> 1.21 
danish/vote/2004/index.wml: 1.2 -> 1.3 
danish/vote/2004/vote_001.wml: 1.16 -> 1.17 
danish/vote/2005/index.wml: 1.2 -> 1.3 
danish/vote/2005/vote_001.wml: 1.14 -> 1.15 
english/debian.css: 1.51 -> 1.52 
english/template/debian/votebar.wml: 1.111 -> 1.112 
english/vote/howto_follow.wml: 1.10 -> 1.11 
english/vote/howto_proposal.wml: 1.16 -> 1.17 
english/vote/index.wml: 1.19 -> 1.20 
english/vote/proposal.template: 1.1 -> 1.2 
english/vote/style.inc: 1.6 -> 1.7 
english/vote/vote.template: 1.3 -> 1.4 
english/vote/1999/index.wml: 1.6 -> 1.7 
english/vote/1999/vote_0000.wml: 1.11 -> 1.12 
english/vote/1999/vote_0001.wml: 1.19 -> 1.20 
english/vote/1999/vote_0002.wml: 1.17 -> 1.18 
english/vote/1999/vote_0004.wml: 1.25 -> 1.26 
english/vote/1999/vote_0005.wml: 1.13 -> 1.14 
english/vote/2000/index.wml: 1.4 -> 1.5 
english/vote/2000/vote_0007.wml: 1.9 -> 1.10 
english/vote/2000/vote_0008.wml: 1.10 -> 1.11 
english/vote/2000/vote_0009.wml: 1.9 -> 1.10 
english/vote/2000/vote_0010.wml: 1.9 -> 1.10 
english/vote/2000/vote_0011.wml: 1.9 -> 1.10 
english/vote/2001/index.wml: 1.2 -> 1.3 
english/vote/2001/vote_0001.wml: 1.6 -> 1.7 
english/vote/2001/vote_0002.wml: 1.5 -> 1.6 
english/vote/2002/index.wml: 1.2 -> 1.3 
english/vote/2002/stats.wml: 1.4 -> 1.5 
english/vote/2002/vote_0001.wml: 1.25 -> 1.26 
english/vote/2002/platforms/raphael.wml: 1.15 -> 1.16 
english/vote/2003/gr_sec415_stats.wml: 1.1 -> 1.2 
english/vote/2003/gr_voting_stats.wml: 1.3 -> 1.4 
english/vote/2003/index.wml: 1.2 -> 1.3 
english/vote/2003/leader2003_stats.wml: 1.2 -> 1.3 
english/vote/2003/vote_0001.wml: 1.26 -> 1.27 
english/vote/2003/vote_0002.wml: 1.25 -> 1.26 
english/vote/2003/vote_0003.wml: 1.22 -> 1.23 
english/vote/2003/platforms/moshez.wml: 1.6 -> 1.7 
english/vote/2004/gr_editorial_stats.wml: 1.1 -> 1.2 
english/vote/2004/gr_non_free_stats.wml: 1.3 -> 1.4 
english/vote/2004/gr_sarge_stats.wml: 1.2 -> 1.3 
english/vote/2004/index.wml: 1.2 -> 1.3 
english/vote/2004/leader2004_stats.wml: 1.2 -> 1.3 
english/vote/2004/vote_001.wml: 1.20 -> 1.21 
english/vote/2004/vote_002.wml: 1.21 -> 1.22 
english/vote/2004/vote_003.wml: 1.9 -> 1.10 
english/vote/2004/vote_004.wml: 1.57 -> 1.58 
english/vote/2004/vote_005.wml: 1.7 -> 1.8 
english/vote/2004/platforms/tbm.wml: 1.5 -> 1.6 
english/vote/2005/Log-debian-dpl-debate.wml: 1.9 -> 1.10 
english/vote/2005/index.wml: 1.2 -> 1.3 
english/vote/2005/leader2005_stats.wml: 1.2 -> 1.3 
english/vote/2005/vote_001.wml: 1.26 -> 1.27 
english/vote/2005/platforms/mjg59.wml: 1.3 -> 1.4 
french/vote/howto_follow.wml: 1.8 -> 1.9 
french/vote/howto_proposal.wml: 1.18 -> 1.19 
french/vote/index.wml: 1.12 -> 1.13 
french/vote/1999/index.wml: 1.2 -> 1.3 
french/vote/1999/vote_0000.wml: 1.3 -> 1.4 
french/vote/1999/vote_0001.wml: 1.3 -> 1.4 
french/vote/1999/vote_0002.wml: 1.5 -> 1.6 
french/vote/1999/vote_0004.wml: 1.2 -> 1.3 
french/vote/1999/vote_0005.wml: 1.3 -> 1.4 
french/vote/2000/index.wml: 1.3 -> 1.4 
french/vote/2000/vote_0007.wml: 1.2 -> 1.3 
french/vote/2000/vote_0008.wml: 1.3 -> 1.4 
french/vote/2000/vote_0009.wml: 1.2 -> 1.3 
french/vote/2000/vote_0010.wml: 1.2 -> 1.3 
french/vote/2000/vote_0011.wml: 1.4 -> 1.5 
french/vote/2001/index.wml: 1.3 -> 1.4 
french/vote/2001/vote_0001.wml: 1.3 -> 1.4 
french/vote/2001/vote_0002.wml: 1.3 -> 1.4 
french/vote/2002/index.wml: 1.2 -> 1.3 
french/vote/2002/stats.wml: 1.3 -> 1.4 
french/vote/2002/vote_0001.wml: 1.8 -> 1.9 
french/vote/2002/platforms/raphael.wml: 1.5 -> 1.6 
french/vote/2003/gr_sec415_stats.wml: 1.2 -> 1.3 
french/vote/2003/gr_voting_stats.wml: 1.2 -> 1.3 
french/vote/2003/index.wml: 1.2 -> 1.3 
french/vote/2003/leader2003_stats.wml: 1.3 -> 1.4 
french/vote/2003/vote_0001.wml: 1.5 -> 1.6 
french/vote/2003/vote_0002.wml: 1.11 -> 1.12 
french/vote/2003/vote_0003.wml: 1.12 -> 1.13 
french/vote/2003/platforms/moshez.wml: 1.2 -> 1.3 
french/vote/2004/gr_editorial_stats.wml: 1.2 -> 1.3 
french/vote/2004/gr_non_free_stats.wml: 1.2 -> 1.3 
french/vote/2004/gr_sarge_stats.wml: 1.1 -> 1.2 
french/vote/2004/index.wml: 1.2 -> 1.3 
french/vote/2004/leader2004_stats.wml: 1.4 -> 1.5 
french/vote/2004/vote_001.wml: 1.16 -> 1.17 
french/vote/2004/vote_002.wml: 1.14 -> 1.15 
french/vote/2004/vote_003.wml: 1.7 -> 1.8 
french/vote/2004/vote_004.wml: 1.28 -> 1.29 
french/vote/2004/vote_005.wml: 1.5 -> 1.6 
french/vote/2004/platforms/tbm.wml: 1.6 -> 1.7 
french/vote/2005/Log-debian-dpl-debate.wml: 1.33 -> 1.34 
french/vote/2005/index.wml: 1.2 -> 1.3 
french/vote/2005/leader2005_stats.wml: 1.2 -> 1.3 
french/vote/2005/vote_001.wml: 1.14 -> 1.15 
french/vote/2005/platforms/mjg59.wml: 1.7 -> 1.8 
german/vote/howto_follow.wml: 1.9 -> 1.10 
german/vote/howto_proposal.wml: 1.9 -> 1.10 
german/vote/index.wml: 1.10 -> 1.11 
german/vote/1999/index.wml: 1.2 -> 1.3 
german/vote/2000/index.wml: 1.2 -> 1.3 
german/vote/2001/index.wml: 1.2 -> 1.3 
german/vote/2001/vote_0001.wml: 1.5 -> 1.6 
german/vote/2001/vote_0002.wml: 1.1 -> 1.2 
german/vote/2002/index.wml: 1.2 -> 1.3 
german/vote/2002/stats.wml: 1.5 -> 1.6 
german/vote/2002/vote_0001.wml: 1.15 -> 1.16 
german/vote/2003/index.wml: 1.2 -> 1.3 
german/vote/2003/vote_0001.wml: 1.20 -> 1.21 
german/vote/2004/gr_editorial_stats.wml: 1.1 -> 1.2 
german/vote/2004/index.wml: 1.3 -> 1.4 
german/vote/2004/leader2004_stats.wml: 1.2 -> 1.3 
german/vote/2004/vote_001.wml: 1.14 -> 1.15 
german/vote/2004/platforms/tbm.wml: 1.12 -> 1.13 
german/vote/2005/index.wml: 1.2 -> 1.3 
german/vote/2005/leader2005_stats.wml: 1.2 -> 1.3 
german/vote/2005/vote_001.wml: 1.12 -> 1.13 
japanese/vote/index.wml: 1.8 -> 1.9 
japanese/vote/1999/index.wml: 1.2 -> 1.3 
japanese/vote/2000/index.wml: 1.2 -> 1.3 
japanese/vote/2001/index.wml: 1.2 -> 1.3 
japanese/vote/2002/index.wml: 1.2 -> 1.3 
japanese/vote/2003/index.wml: 1.2 -> 1.3 
japanese/vote/2003/vote_0001.wml: 1.17 -> 1.18 
japanese/vote/2004/index.wml: 1.1 -> 1.2 
portuguese/vote/index.wml: 1.11 -> 1.12 
portuguese/vote/2004/index.wml: 1.3 -> 1.4 
portuguese/vote/2004/leader2004_stats.wml: 1.2 -> 1.3 
portuguese/vote/2004/vote_001.wml: 1.7 -> 1.8 
portuguese/vote/2004/vote_002.wml: 1.3 -> 1.4 
portuguese/vote/2004/vote_003.wml: 1.5 -> 1.6 
romanian/vote/index.wml: 1.17 -> 1.18 
russian/vote/2003/gr_sec415_stats.wml: 1.1 -> 1.2 
russian/vote/2003/gr_voting_stats.wml: 1.2 -> 1.3 
russian/vote/2003/index.wml: 1.2 -> 1.3 
russian/vote/2003/leader2003_stats.wml: 1.1 -> 1.2 
russian/vote/2003/vote_0001.wml: 1.14 -> 1.15 
russian/vote/2003/vote_0002.wml: 1.13 -> 1.14 
russian/vote/2003/vote_0003.wml: 1.9 -> 1.10 
russian/vote/2003/platforms/moshez.wml: 1.4 -> 1.5 
russian/vote/2004/gr_editorial_stats.wml: 1.1 -> 1.2 
russian/vote/2004/gr_non_free_stats.wml: 1.2 -> 1.3 
russian/vote/2004/gr_sarge_stats.wml: 1.2 -> 1.3 
russian/vote/2004/index.wml: 1.2 -> 1.3 
russian/vote/2004/leader2004_stats.wml: 1.2 -> 1.3 
russian/vote/2004/vote_001.wml: 1.10 -> 1.11 
russian/vote/2004/vote_002.wml: 1.10 -> 1.11 
russian/vote/2004/vote_003.wml: 1.10 -> 1.11 
russian/vote/2004/vote_004.wml: 1.19 -> 1.20 
russian/vote/2004/vote_005.wml: 1.4 -> 1.5 
spanish/vote/howto_follow.wml: 1.8 -> 1.9 
spanish/vote/howto_proposal.wml: 1.12 -> 1.13 
spanish/vote/index.wml: 1.9 -> 1.10 
spanish/vote/1999/index.wml: 1.2 -> 1.3 
spanish/vote/2000/index.wml: 1.2 -> 1.3 
spanish/vote/2000/vote_0007.wml: 1.4 -> 1.5 
spanish/vote/2000/vote_0008.wml: 1.6 -> 1.7 
spanish/vote/2000/vote_0009.wml: 1.5 -> 1.6 
spanish/vote/2000/vote_0010.wml: 1.5 -> 1.6 
spanish/vote/2000/vote_0011.wml: 1.8 -> 1.9 
spanish/vote/2001/index.wml: 1.2 -> 1.3 
spanish/vote/2001/vote_0001.wml: 1.3 -> 1.4 
spanish/vote/2001/vote_0002.wml: 1.3 -> 1.4 
spanish/vote/2002/index.wml: 1.3 -> 1.4 
spanish/vote/2002/stats.wml: 1.2 -> 1.3 
spanish/vote/2002/vote_0001.wml: 1.9 -> 1.10 
spanish/vote/2004/index.wml: 1.2 -> 1.3 
swedish/vote/howto_follow.wml: 1.13 -> 1.14 
swedish/vote/howto_proposal.wml: 1.22 -> 1.23 
swedish/vote/index.wml: 1.16 -> 1.17 
swedish/vote/1999/index.wml: 1.6 -> 1.7 
swedish/vote/2000/index.wml: 1.3 -> 1.4 
swedish/vote/2001/index.wml: 1.2 -> 1.3 
swedish/vote/2002/index.wml: 1.2 -> 1.3 
swedish/vote/2003/index.wml: 1.2 -> 1.3 
swedish/vote/2004/index.wml: 1.2 -> 1.3 
swedish/vote/2005/index.wml: 1.2 -> 1.3

18 files changed, 303 insertions, 305 deletions

diff --git a/danish/vote/1999/index.wml b/danish/vote/1999/index.wml
index 1f49ad831ef..0b9c0d63e42 100644
--- a/danish/vote/1999/index.wml
+++ b/danish/vote/1999/index.wml
@@ -1,8 +1,8 @@
 <define-tag pagetitle>Sager taget op i 1999</define-tag>
-#use wml::debian::template title="<pagetitle>"
-#use wml::debian::translation-check translation="1.6"
+#use wml::debian::template title="<pagetitle>" NOHEADER="true"
+#use wml::debian::translation-check translation="1.7"
 #use wml::debian::recent_list
 #use wml::debian::votebar	
-#include "$(ENGLISHDIR)/vote/style.inc"
 
+<h1><pagetitle></h1>
 <:= get_recent_list('.', '0', '$(ENGLISHDIR)/vote/1999', 'list', 'vote_\d*') :>
diff --git a/danish/vote/1999/vote_0001.wml b/danish/vote/1999/vote_0001.wml
index b7ccb93366a..691725be803 100644
--- a/danish/vote/1999/vote_0001.wml
+++ b/danish/vote/1999/vote_0001.wml
@@ -1,58 +1,66 @@
 <define-tag pagetitle>Ledervalg 1999</define-tag>
 <define-tag status>F</define-tag>
 
-#use wml::debian::template title="<pagetitle>"
-#use wml::debian::translation-check translation="1.19"
+#use wml::debian::template title="<pagetitle>" NOHEADER="true"
+#use wml::debian::translation-check translation="1.20"
+#use wml::debian::toc
 #use wml::debian::votebar	
 
+<h1><pagetitle></h1>
+
 <h2>Valg 1999</h2>
+<toc-display/>
+    <vdate />
+    <p>2. december 1998</p>
+
+
+    <vtimeline />
+    <table class="vote">
+    <tr>
+    <th>Nomeringer lukker</th><td>23. december 1998</td>
+    </tr>
+    <tr>
+    <th>Valgkampagner slutter</th><td>13. januar 1999</td>
+    </tr>
+    <tr>
+    <th>Afstemning slutter<th><td>3. februar 1999</td>
+    </tr>
+    </table>
+
+
+
+      <vnominations />
+      <p>I modtagelsesrækkefølge</p>
+
 
-<table>
-  <tr>
-    <td><b>Dato</b>:</td>
-    <td>2. december 1998</td>
-  </tr>
-  <tr>
-    <td><b>Tidslinie</b>:</td>
-    <td>Nomeringer lukker: 23. december 1998<br>
-    Valgkampagner slutter: 13. januar 1999<br>
-    Afstemning slutter: 3. februar 1999</td>
-  </tr>
-  <tr>
-    <td>
-      <b>Nomineringer</b>:<br>
-      I modtagelsesrækkefølge
-    </td>
-    <td>
       <ol>
         <li>Joseph Carter <a href="mailto:knghtbrd@debian.org">[knghtbrd@debian.org]</a></li>
 	<li>Ben Collins <a href="mailto:bcollins@debian.org">[bcollins@debian.org]</a></li>
 	<li>Wichert Akkerman <a href="mailto:wakkerma@debian.org">[wakkerma@debian.org]</a></li>
 	<li>Richard Braakman <a href="mailto:dark@xs4all.nl">[dark@xs4all.nl]</a></li>
       </ol>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <b>Valgprogrammer</b>:<br>
-      Efter rækkefølgen ovenfor<br>
-    </td>
-    <td>
+
+
+
+
+      <vplatforms />
+      <p>Efter rækkefølgen ovenfor</p>
+
+
       <ul>
         <li><a href="joseph">Joseph Carter</a></li>
 	<li><a href="ben">Ben Collins</a></li>
 	<li><a href="wichert">Wichert Akkerman</a></li>
 	<li><a href="richard">Richard Braakman</a></li>
       </ul>
-    </td>
-  </tr>
-  <tr>
-    <td><b>Beslutningsdygtigt antal</b>:</td>
-    <td>Med 347 udviklere&#44; Q=9.3 giver et beslutningsdygtigt antal på 28</td>
-  </tr>
-  <tr>
-    <td><b>Resultat</b>:</td>
-    <td>valg99-resultater - 208 gyldige stemmer<br>
+
+
+
+    <vquorum />
+    <p>Med 347 udviklere&#44; Q=9.3 giver et beslutningsdygtigt antal på 28</p>
+
+<voutcome />
+    <p>valg99-resultater - 208 gyldige stemmer<br>
     <br>
     WICHERT AKKERMAN
     <ul>
@@ -61,8 +69,6 @@
       <li>Dominerer RICHARD BRAAKMAN [149 - 55]
       <li>Dominerer INGEN af ovenstående [196 - 7]
    </ul>
-   <br>
+   <p>
    "WICHERT AKKERMAN" vinder ved at dominere alle andre.
-   </td>
-  </tr>
-</table>
+   </p>
diff --git a/danish/vote/2000/index.wml b/danish/vote/2000/index.wml
index 02f7766aef7..aeacb849918 100644
--- a/danish/vote/2000/index.wml
+++ b/danish/vote/2000/index.wml
@@ -1,8 +1,8 @@
 <define-tag pagetitle>Sager taget op i 2000</define-tag>
-#use wml::debian::template title="<pagetitle>"
-#use wml::debian::translation-check translation="1.4"
+#use wml::debian::template title="<pagetitle>" NOHEADER="true"
+#use wml::debian::translation-check translation="1.5"
 #use wml::debian::recent_list
 #use wml::debian::votebar	
-#include "$(ENGLISHDIR)/vote/style.inc"
 
+<h1><pagetitle></h1>
 <:= get_recent_list('.', '0', '$(ENGLISHDIR)/vote/2000', 'list', 'vote_\d*') :>
diff --git a/danish/vote/2000/vote_0007.wml b/danish/vote/2000/vote_0007.wml
index 316163995f6..a1b0231efb4 100644
--- a/danish/vote/2000/vote_0007.wml
+++ b/danish/vote/2000/vote_0007.wml
@@ -1,39 +1,50 @@
 <define-tag pagetitle>Ledervalg 2000</define-tag>
 <define-tag status>F</define-tag>
 
-#use wml::debian::template title="<pagetitle>"
-#use wml::debian::translation-check translation="1.9"
+#use wml::debian::template title="<pagetitle>" NOHEADER="true"
+#use wml::debian::translation-check translation="1.10"
+#use wml::debian::toc
 #use wml::debian::votebar	
 
+<h1><pagetitle></h1>
+
 <h2>Valg 2000</h2>
+<toc-display/>
+
+	<vdate />
+        <p>9. januar 2000</p>
+
+
+	<vtimeline />
+    <table class="vote">
+	<tr>
+	<th>Nomineringer lukker</th><td>31. januar 2000</td>
+	</tr>
+	<tr>
+	<th>Valgkampagner slutter</th><td>21. februar 2000</td>
+	</tr>
+	<tr>
+	<th>Afstemning slutter</th><td>16. marts 2000</td>
+	</tr>
+	</table>
+
 
-<table>
-    <tr>
-	<td valign="top"><b>Dato</b>:</td>
-        <td valign="top">9. januar 2000</td>
-    </tr>
-    <tr>
-	<td valign="top"><b>Tidslinie</b>:</td>
-	<td valign="top">Nomineringer lukker: 31. januar 2000<br>
-	Valgkampagner slutter: 21. februar 2000<br>
-	Afstemning slutter: 16. marts 2000</td>
-    </tr>
-    <tr>
-	<td valign="top"><b>Nomineringer</b>:</td>
-	<td valign="top"><ol>
-		<li>Ben Collins <a href="mailto:bcollins@debian.org">[bcollins@debian.org]</a></li>
-		<li>Wichert Akkerman <a href="mailto:wakkerma@debian.org">[wakkerma@debian.org]</a></li>
-		<li>Joel Klecker <a href="mailto:espy@debian.org">[espy@debian.org]</a></li>
-		<li>Matthew Vernon <a href="mailto:matthew@debian.org">[matthew@debian.org]</a></li>
-	</ol></td>
-    </tr>
-    <tr>
-	<td valign="top"><b>Beslutningsdygtigt antal</b>:</td>
-	<td valign="top">Med 347 udviklere&#44; Q=9.3 giver et beslutningsdygtigt antal på 28</td>
-    </tr>
-    <tr>
-        <td valign="top"><b>Resultat</b>:</td>
-	<td valign="top">valg00-resultater - 216 gyldige stemmer
+	<vnominations />
+	<ol>
+	<li>Ben Collins <a href="mailto:bcollins@debian.org">[bcollins@debian.org]</a></li>
+	<li>Wichert Akkerman <a href="mailto:wakkerma@debian.org">[wakkerma@debian.org]</a></li>
+	<li>Joel Klecker <a href="mailto:espy@debian.org">[espy@debian.org]</a></li>
+	<li>Matthew Vernon <a href="mailto:matthew@debian.org">[matthew@debian.org]</a></li>
+	</ol>
+
+
+	<vquorum />
+	<p>Med 347 udviklere&#44; Q=9.3 giver et beslutningsdygtigt
+	antal på 28</p>
+
+
+        <voutcome />
+	<p>valg00-resultater - 216 gyldige stemmer
             <br>
 	    Vinderen er, i sin anden valgperiode, Wichert Akkerman.
             <br>
@@ -41,7 +52,7 @@
 	    Detaljeret valgresultat</a>.
             <br>
             Se også <a href="leadership_debate/">debatten om ledervalget</a>.
-            <p align="center">
+            <p class="center">
 	      <a style="margin-left: auto; margin-right: auto;" href="vote_0007_results.dot">
                 <img src="vote_0007_results.png" alt="Grafisk præsentation af resultatet">
               </a>
@@ -49,6 +60,4 @@
             <p>Til forståelse af Condorcet-metoden, er den engelsksprogede 
             <a href="http://en.wikipedia.org/wiki/Condorcet_method">\
 	    Wikipedia-artikel</a> ganske informativ.</p>
-	</td>
-    </tr>
-</table>
+
diff --git a/danish/vote/2001/index.wml b/danish/vote/2001/index.wml
index a255fc065b3..d572d157b8c 100644
--- a/danish/vote/2001/index.wml
+++ b/danish/vote/2001/index.wml
@@ -1,8 +1,8 @@
 <define-tag pagetitle>Sager taget op i 2001</define-tag>
-#use wml::debian::translation-check translation="1.2"
-#use wml::debian::template title="<pagetitle>"
+#use wml::debian::translation-check translation="1.3"
+#use wml::debian::template title="<pagetitle>" NOHEADER="true"
 #use wml::debian::recent_list
 #use wml::debian::votebar	
-#include "$(ENGLISHDIR)/vote/style.inc"
 
+<h1><pagetitle></h1>
 <:= get_recent_list('.', '0', '$(ENGLISHDIR)/vote/2001', 'list', 'vote_\d*') :>
diff --git a/danish/vote/2001/vote_0001.wml b/danish/vote/2001/vote_0001.wml
index 0553114b5d0..1044fe6e183 100644
--- a/danish/vote/2001/vote_0001.wml
+++ b/danish/vote/2001/vote_0001.wml
@@ -1,21 +1,29 @@
 <define-tag pagetitle>Ledervalg 2001</define-tag>
 <define-tag status>F</define-tag>
-#use wml::debian::template title="<pagetitle>"
-#use wml::debian::translation-check translation="1.6"
+#use wml::debian::template title="<pagetitle>" NOHEADER="true"
+#use wml::debian::translation-check translation="1.7"
+#use wml::debian::toc
 #use wml::debian::votebar	
 
-<table>
-<tr>
-  <td valign="top"><strong>Tidsplan</strong>:</td>
-  <td valign="top">
-  Nomineringsperiode: 24. januar 2001 til 13. februar 2001<br>
-  Kampagneperiode: 14. februar 2001 til 6. marts 2001<br>
-  Valgperiode: 7. marts 2001 til 28. marts 2001
-  </td>
-</tr>
-<tr>
-  <td valign="top"><strong>Nomineringer</strong>:</td>
-  <td valign="top">
+<h1><pagetitle></h1>
+<h2> </h2>
+<toc-display/>
+
+  <vtimeline />
+    <table class="vote">
+  <tr>
+  <th>Nomineringsperiode</th><td>24. januar 2001 til 13. februar 2001</td>
+  </tr>
+  <tr>
+  <th>Kampagneperiode</th><td>14. februar 2001 til 6. marts 2001</td>
+  </tr>
+  <tr>
+  <th>Valgperiode</th><td>7. marts 2001 til 28. marts 2001</td>
+  </tr>
+  </table>
+
+
+  <vnominations />
   <ol>
     <li>Branden Robinson [<a href="mailto:branden@debian.org">branden@debian.org</a>]
         [<a href="http://lists.debian.org/debian-vote-0102/msg00018.html">valgprogram</a>]
@@ -26,20 +34,19 @@
     <li>Bdale Garbee [<a href="mailto:bdale@debian.org">bdale@debian.org</a>]
         [<a href="http://lists.debian.org/debian-vote-0102/msg00038.html">valgprogram</a>]
   </ol>
-  </td>
-</tr>
-<tr>
-  <td valign="top"><strong>Beslutningsdygtigt antal</strong>:</td>
-  <td valign="top">?</td>
-</tr>
-<tr>
- <td valign="top"><strong>Resultat</strong>:</td>
-  <td valign="top">
+
+
+  <vquorum />
+  <p>?</p>
+
+
+ <voutcome />
+  <p>
   Der blev afgivet 311 gyldige stemmer.
   <br>
   Vinderen er Ben Collins.
-  <br>
-            <p align="center">
+  </p>
+            <p class="center">
 	      <a style="margin-left: auto; margin-right: auto;" href="vote_0001_results.dot">
                 <img src="vote_0001_results.png" alt="Grafisk præsentation af resultatet">
               </a>
@@ -47,7 +54,6 @@
             <p>Til forståelse af Condorcet-metoden, er den engelsksprogede 
             <a href="http://en.wikipedia.org/wiki/Condorcet_method">\
 	    Wikipedia-artikel</a> ganske informativ.</p>  
-  <a href="http://lists.debian.org/debian-vote-0103/msg00159.html">Detaljerede valgresultater</a>.
-  </td>
-</tr>
-</table>
+  <p><a href="http://lists.debian.org/debian-vote-0103/msg00159.html">Detaljerede valgresultater</a>.
+  </p>
+
diff --git a/danish/vote/2002/index.wml b/danish/vote/2002/index.wml
index f12a2ae414e..55c49ec2964 100644
--- a/danish/vote/2002/index.wml
+++ b/danish/vote/2002/index.wml
@@ -1,8 +1,8 @@
 <define-tag pagetitle>Sager taget op i 2002</define-tag>
-#use wml::debian::template title="<pagetitle>"
+#use wml::debian::template title="<pagetitle>" NOHEADER="true"
 #use wml::debian::recent_list
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::translation-check translation="1.3"
 #use wml::debian::votebar	
-#include "$(ENGLISHDIR)/vote/style.inc"
 
+<h1><pagetitle></h1>
 <:= get_recent_list('.', '0', '$(ENGLISHDIR)/vote/2002', 'list', 'vote_\d*') :>
diff --git a/danish/vote/2002/stats.wml b/danish/vote/2002/stats.wml
index c5ff710dd6e..7aaaefd3fce 100644
--- a/danish/vote/2002/stats.wml
+++ b/danish/vote/2002/stats.wml
@@ -1,11 +1,13 @@
 #use wml::debian::template title="Statistik over Debians projektledervalg 2002" BARETITLE="true"
-#use wml::debian::translation-check translation="1.4"
+#use wml::debian::translation-check translation="1.5"
 
     <table width="90%">
+    	<colgroup span="4" width="25%">
+	</colgroup>
 	<tr>
-	  <th width="25%">Stemmer modtaget</th>
-	  <th width="25%">Accepteret</th>
-	  <th width="25%">Afvist</th>
+	  <th>Stemmer modtaget</th>
+	  <th>Accepteret</th>
+	  <th>Afvist</th>
 	  <th>Unique Votes</th>
 	</tr>
 	<tr>
diff --git a/danish/vote/2002/vote_0001.wml b/danish/vote/2002/vote_0001.wml
index 200dd14f4a5..c00499d942e 100644
--- a/danish/vote/2002/vote_0001.wml
+++ b/danish/vote/2002/vote_0001.wml
@@ -1,21 +1,23 @@
 <define-tag pagetitle>Debians projektledervalg 2002</define-tag>
 <define-tag status>F</define-tag>
-#use wml::debian::template title="<pagetitle>"
-#use wml::debian::translation-check translation="1.25"
+#use wml::debian::template title="<pagetitle>" NOHEADER="true"
+#use wml::debian::translation-check translation="1.26"
+#use wml::debian::toc
 #use wml::debian::votebar	
 
-<table>
-<tr>
-  <td valign="top"><strong>Tidsplan</strong>:</td>
-  <td valign="top">
+<h1><pagetitle></h1>
+<h2> </h2>
+
+<toc-display/>
+  <vtimeline />
+  <p>
   Nomineringsperiode: 6. februar 2002 til 27. februar 2002<br>
   Kampagneperiode: 28. februar 2002 til 23. marts 2002<br>
   Valgperiode: 24. marts 2002 til kl. 23.59.59 UTC den 16. april 2002
-  </td>
-</tr>
-<tr>
-  <td valign="top"><strong>Nomineringer</strong>:</td>
-  <td valign="top">
+  </p>
+
+
+  <vnominations />
   <ol>
     <li>Raphaël Hertzog [<email hertzog@debian.org>]
         [<a href="platforms/raphael">valgprogram</a>]
@@ -24,21 +26,20 @@
     <li>Bdale Garbee [<email bdale@debian.org>]
         [<a href="platforms/bdale">valgprogram</a>]
   </ol>
-  </td>
-</tr>
-<tr>
-  <td valign="top"><strong>Debat</strong>:</td>
-  <td valign="top">foreløbig afskrift:
+
+
+  <vdebate />
+  <p>foreløbig afskrift:
     <a href="http://raw.no/debian/debian-debate.html">HTML</a>,
     <a href="http://raw.no/debian/debian-debate.txt">ren tekst</a>
     <br>
     Mange tak til Ben Collins for at styre debatten, og til Rob Levin og OPN
     for at lade os foretage debatten på deres netværk.
-  </td>
-</tr>
-<tr>
-  <td valign="top"><strong>Data og statistikker</strong>:</td>
-  <td valign="top">Under valgperioden er der blevet indsamlet nogle 
+  </p>
+
+
+  <vstatistics />
+  <p>Under valgperioden er der blevet indsamlet nogle 
   statistikker om stemmeafgivelser og bekræftelser. Desuden er listen over 
   <a href="voters.txt">folk</a> der har deltaget i afstemningen tilgængelig, 
   indeholdende mærker så man kan kontrollere om ens stemme er blevet optalt 
@@ -48,8 +49,8 @@
   En <a href="http://www.electionmethods.org/CondorcetEx.htm">mere detaljeret 
   forklaring af "beat matrix"</a> (på engelsk) kan hjælpe med forståelsen af 
   tabellen.    
-  <br>
-  <table>
+  </p>
+  <table class="vote">
     <tr>
       <th>&nbsp;</th>
       <th>1</th>
@@ -86,24 +87,26 @@
       <td>&nbsp;</td>
     </tr>
   </table>
-  Ved at se på række 2, kolonne 1, kan man se at kandidat 2 (Raphaël Hertzog)
-  fik 199 stemmer mere end kandidat 1 (Branden Robinson)<br>
-  Ved at se på række 1, kolonne 2, kan man se at kandidat 1 (Branden Robinson)
-  fik 255 stemmer mere end kandidat 2 (Raphaël Hertzog)
-  </td>
-</tr>
-<tr>
-  <td valign="top"><strong>Beslutningsdygtigt antal</strong>:</td>
-  <td valign="top">Med 939 udviklere, Q=15,32155, resulterende i et beslutningsdygtigt antal på 45,96466</td>
-</tr>
-<tr>
- <td valign="top"><strong>Resultat</strong>:</td>
-  <td valign="top">
+ <p>
+ Ved at se på række 2, kolonne 1, kan man se at kandidat 2 (Raphaël Hertzog)
+ fik 199 stemmer mere end kandidat 1 (Branden Robinson)<br>
+ Ved at se på række 1, kolonne 2, kan man se at kandidat 1 (Branden Robinson)
+ fik 255 stemmer mere end kandidat 2 (Raphaël Hertzog)
+</p>
+
+
+  <vquorum />
+  <p>Med 939 udviklere, Q=15,32155, resulterende i et beslutningsdygtigt antal på 45,96466</p>
+
+
+ <voutcome />
+  <p>
     Vinderen af valget er Bdale Garbee.<br>
     Jeg takker Branden Robinson og Raphaël Hertzog for deres arbejde i 
     projektet ved at stille op til posten som projektleder, og for at give 
     udviklerne en stærk og varieret gruppe af kandidater.
-            <p align="center">
+  </p>
+            <p class="center">
 	      <a style="margin-left: auto; margin-right: auto;" href="vote_0001_results.dot">
                 <img src="vote_0001_results.png" alt="Grafisk præsentation af resultatet">
               </a>
@@ -113,8 +116,9 @@
 	    Wikipedia-artikel</a> ganske informativ.</p>
     
     <p>Antal unikke stemmer i alt: 475<br>
-    Parvise afstemninger, vundet-tabt-uafgjort:</p>
-    <table>
+    Parvise afstemninger, vundet-tabt-uafgjort:
+    </p>
+    <table class="vote">
       <tr>
         <th>Branden Robinson</th>
         <td>2-1-0</td>
@@ -136,6 +140,4 @@
         <td>stemmer imod i største nederlag/tætteste afgørelse: 443</td>
       </tr>
     </table>  
-  </td>
-</tr>
-</table>
+
diff --git a/danish/vote/2003/index.wml b/danish/vote/2003/index.wml
index 4337d78e889..4d6d2c0e227 100644
--- a/danish/vote/2003/index.wml
+++ b/danish/vote/2003/index.wml
@@ -1,7 +1,8 @@
 <define-tag pagetitle>Sager taget op i 2003</define-tag>
-#use wml::debian::template title="<pagetitle>"
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::template title="<pagetitle>" NOHEADER="true"
+#use wml::debian::translation-check translation="1.3"
 #use wml::debian::recent_list
 #use wml::debian::votebar	
 
+<h1><pagetitle></h1>
 <:= get_recent_list('.', '0', '$(ENGLISHDIR)/vote/2003', 'list', 'vote_\d*') :>
diff --git a/danish/vote/2003/vote_0001.wml b/danish/vote/2003/vote_0001.wml
index d8ebd4450b9..ece68acf5dc 100644
--- a/danish/vote/2003/vote_0001.wml
+++ b/danish/vote/2003/vote_0001.wml
@@ -1,35 +1,35 @@
 <define-tag pagetitle>Debians projektledervalg 2003</define-tag>
 <define-tag status>F</define-tag>
-#use wml::debian::template title="<pagetitle>"
-#use wml::debian::translation-check translation="1.26"
+#use wml::debian::template title="<pagetitle>" NOHEADER="true"
+#use wml::debian::translation-check translation="1.27"
+#use wml::debian::toc
 #use wml::debian::votebar	
 
-<table>
-<tr>
-  <td valign="top"><strong>Tidsplan</strong>:</td>
-  <td valign="top">
-    <table>
+<h1><pagetitle></h1>
+<h2> </h2>
+<toc-display/>
+
+  <vtimeline />
+    <table class="vote">
       <tr>
-        <th valign="top">Nomineringsperiode:</th>
-	<td valign="top">24. januar 2003, 00.00.01 UTC</td>
-        <td valign="top">14. februar 2003, 00.00.00 UTC</td>
+        <th>Nomineringsperiode:</th>
+	<td>24. januar 2003, 00.00.01 UTC</td>
+        <td>14. februar 2003, 00.00.00 UTC</td>
       </tr>
       <tr>
-	<th valign="top">Kampagneperiode:</th>
-	<td valign="top">14. februar 2003, 00.00.01 UTC</td>
-        <td valign="top">8. marts 2003, 00.00.00 UTC</td>
+	<th>Kampagneperiode:</th>
+	<td>14. februar 2003, 00.00.01 UTC</td>
+        <td>8. marts 2003, 00.00.00 UTC</td>
       </tr>
       <tr>
-	<th valign="top">Afstemningsperiode:</th>
-	<td valign="top">8. marts 2003, 00.00.01 UTC</td>
-        <td valign="top">29. marts 2003, 00.00.00 UTC/<td>
+	<th>Afstemningsperiode:</th>
+	<td>8. marts 2003, 00.00.01 UTC</td>
+        <td>29. marts 2003, 00.00.00 UTC/<td>
       </tr>
     </table>
-  </td>
-</tr>
-<tr>
-  <td valign="top"><strong>Nomineringer</strong>:</td>
-  <td valign="top">
+
+
+  <vnominations />
     <ol>
       <li>Moshe Zadka [<email moshez@debian.org>]	  
           [<a href="platforms/moshez">program</a>]</li>
@@ -43,11 +43,9 @@
     <p>Stemmer kan modtages via e-mail, ved at skrive til 
     <a href="mailto:ballot@vote.debian.org">ballot@vote.debian.org</a> med 
     "leader2003" som emne.</p>
-  </td>
-</tr>
-<tr>
-  <td valign="top"><strong>Debat</strong>:</td>
-  <td valign="top">
+
+
+  <vdebate />
     <p>
       Program for den 7. marts, 22.00.00 UTC, 2003, på IRC-serveren 
       <kbd>irc.freenode.net</kbd>.  Der er to relevante kanaler: 
@@ -66,11 +64,10 @@
       <li><a href="dpl-debate.log">#debian-dpl-debate</a></li>
       <li><a href="dpl-discuss.log">#debian-dpl-discuss</a></li>
     </ul>    
-  </td>  
-</tr>
-<tr>
-  <td valign="top"><strong>Data og statistikker</strong>:</td>
-  <td valign="top">Noget
+
+
+  <vstatistics />
+    <p>Noget
     <a href="leader2003_stats">statistik</a>
     om stemmer og bekræftelser bliver periodisk opsamlet i afstemningsperioden.
     Desuden er listen over 
@@ -83,8 +80,8 @@
   En <a href="http://www.electionmethods.org/CondorcetEx.htm">mere detaljeret 
   forklaring af "beat matrix"</a> (på engelsk) kan hjælpe med forståelsen af 
   tabellen.        
-   	     <br>
-   	       <table align="center">
+   	     </p>
+   	       <table class="vote">
    	         <tr>
    	           <th>&nbsp;</th>
    	           <th>1</th>
@@ -134,28 +131,27 @@
    	           <td>&nbsp;</td>
    	         </tr>
    	       </table>
+	      <p>
 	      Ved at se på række 2, kolonne 1, kan man se at kandidat 2 
 	      (Bdale Garbee) fik 428 stemmer mere end kandidat 1 (Moshe Zadka)<br>
    	      Ved at se på række 1, kolonne 2, kan man se at kandidat 1 
 	      (Moshe Zadka) fik 34 stemmer mere end kandidat 2 (Bdale Garbee).
-  </td>
-</tr>
-<tr>
-  <td valign="top"><strong>Beslutningsdygtigt antal</strong>:</td>
-  <td valign="top">Med 831 udviklere, Q=14.41353531, bliver det 
+  </p>
+
+  <vquorum />
+  <p>Med 831 udviklere, Q=14.41353531, bliver det 
     beslutningsdygtige antal 43.2406059, eller 44 ved oprunding.
     Kun en kandidat vandt ikke med en margen større end det 
-    beslutningsdygtige antal.</td>
-</tr>
-<tr>
-  <td valign="top"><strong>Resultat</strong>:</td>
-  <td valign="top">
+    beslutningsdygtige antal.</p>
+
+  <voutcome />
+  <p>
     Vinderen af valget er Martin Michlmayr.<br>
     Tak til Moshe Zadka, Branden Robinson og Bdale Garbee for deres arbejde 
     i projektet ved at stille op til posten som projektleder, samt for at give
     udviklerne en stærk og varieret gruppe af kandidater.
 
-            <p align="center">
+            <p class="center">
 	      <a style="margin-left: auto; margin-right: auto;" href="vote_0001_results.dot">
                 <img src="vote_0001_results.png" alt="Grafisk præsentation af resultatet">
               </a>
@@ -167,7 +163,7 @@
     <p>Antal unikke stemmer: 488, hvilket er 58.60409 procent at alle mulige 
     stemmer.<br>
     Parvise afstemninger, vundet-tabt-uafgjort:</p>
-    <table align="center">
+    <table class="vote">
       <tr>
         <th>Moshe Zadka</th>
         <td>1-3-0</td>
@@ -206,6 +202,3 @@
 	 4 slår 3: 237 226  = 11   <br>
 	 4 slår 5: 424 39   = 385		
     </p>
-  </td>
-</tr>
-</table>
diff --git a/danish/vote/2004/index.wml b/danish/vote/2004/index.wml
index 3fc6d09d887..5fc415573c9 100644
--- a/danish/vote/2004/index.wml
+++ b/danish/vote/2004/index.wml
@@ -1,7 +1,8 @@
 <define-tag pagetitle>Sager taget op i 2004</define-tag>
-#use wml::debian::template title="<pagetitle>"
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::template title="<pagetitle>" NOHEADER="true"
+#use wml::debian::translation-check translation="1.3"
 #use wml::debian::recent_list
 #use wml::debian::votebar	
 
+<h1><pagetitle></h1>
 <:= get_recent_list('.', '0', '$(ENGLISHDIR)/vote/2004', 'list', 'vote_\d*') :>
diff --git a/danish/vote/2004/vote_001.wml b/danish/vote/2004/vote_001.wml
index 64823da5fb2..9e535131b90 100644
--- a/danish/vote/2004/vote_001.wml
+++ b/danish/vote/2004/vote_001.wml
@@ -1,16 +1,15 @@
 <define-tag pagetitle>Debians projektledervalg 2004</define-tag>
 <define-tag status>F</define-tag>
 #use wml::debian::template title="<pagetitle>" BARETITLE="true" NOHEADER="true"
-#use wml::debian::translation-check translation="1.20"
+#use wml::debian::translation-check translation="1.21"
+#use wml::debian::toc
 #use wml::debian::votebar	
-#include "$(ENGLISHDIR)/vote/style.inc"
 
-    <h1 class="title">Debians projektledervalg 2004</h1>
-    <table class="mainbody">
-        <tr>
-          <td valign="top"><strong>Tidsplan</strong>:</td>
-          <td valign="top">
-            <table style="border-collapse: collapse; border: outset 2pt #8cacbb;">
+<h1><pagetitle></h1>
+<h2>Valg 2004</h2>
+<toc-display/>
+          <vtimeline />
+            <table class="vote">
                 <tr>
                   <th>Nomineringsperiode:</th>
                   <td>7. februar 2004, 00.00.01 UTC</td>
@@ -29,11 +28,9 @@
             </table>
             <p>Bemærk at den nye embedsperiode for projektlederen begynder
 	    den 17. april 2004.</p>
-          </td>
-        </tr>
-        <tr>
-          <td valign="top"><strong>Nomineringer</strong>:</td>
-          <td valign="top">
+
+
+          <vnominations />
 	    <ol>
 	      <li>Martin Michlmayr [<email tbm@debian.org>]
 	          [<a href="platforms/tbm">platform</a>]</li>
@@ -45,21 +42,20 @@
             <p>Stemmesedlen kan modtages via e-mail ved at sende en e-mail til
 	       <a href="mailto:ballot@vote.debian.org">ballot@vote.debian.org</a>
 	       med leader2004 som emne.</p>
-          </td>
-        </tr>
-        <tr>
-          <td valign="top"><strong>Data og statistikker</strong>:</td>
-	  <td valign="top">Noget
+
+
+          <vstatistics />
+	  <p>Noget
 	    <a href="leader2004_stats">statistik</a> om stemmer og bekræftelser 
 	    bliver periodisk opsamlet i afstemningsperioden.  Desuden er listen 
 	    over <a href="leader2004_voters.txt">personer</a> der har deltaget 
 	    i afstemningen tilgængelig.  Prøve-udgaven af 
 	    <a href="leader2004_tally.txt">stemmeoversigten</a> findes også.
-         </td>
-        </tr>
-        <tr>
-          <td valign="top"><strong>Beslutningsdygtigt antal</strong>:</td>
-          <td valign="top">
+         </p>
+
+
+          <vquorum />
+          <p>
 	    Med <a href="vote_001.quorum.log">911 udviklere</a> har vi:
 	    <pre>	
   Aktuelt antal udviklere (#devel) = 911
@@ -71,21 +67,18 @@
   Mulighed 2 opnåede beslutningsdygtigt antal: 394 > 45,2741648183597
   Mulighed 3 opnåede beslutningsdygtigt antal: 442 > 45,2741648183597
             </pre>
-	  </td>
-        </tr>
-	<tr>
-	  <th valign="top"><strong>Flertalskrav</strong>:</th>
-	  <td valign="top">Alle tre foreslag kræver et simpelt flertal.
+
+
+	  <vmajorityreq />
+	  <p>Alle tre foreslag kræver et simpelt flertal.
 	    <pre>
   Mulighed 1 droppes pga. flertal.  0,558 (144/258) <= 1	    
   Mulighed 2 klarede flertallet.    5,629 (394/70) > 1
   Mulighed 3 klarede flertallet.   17,000 (442/26) > 1
 	    </pre>
-	  </td>
-        </tr>
-        <tr>
-          <td valign="top"><strong>Resultat</strong>:</td>
-	  <td valign="top">
+
+
+          <voutcome />
 	    <h3>Valgets vinder er Martin Michlmayr</h3>
             <p>
 	      Tak til Branden Robinson og Gergely Nagy for at stille sig til
@@ -93,7 +86,7 @@
 	      projektleder, samt for give udviklerne en stærk og varieret
 	      gruppe af kandidater.
             </p>
-            <p align="center">	
+            <p class="center">	
 	      <a style="margin-left: auto; margin-right: auto;" href="vote_001_results.dot">	      
 	      <img src="vote_001_results.png" alt="Graphical rendering of the results"></a>								    
 	    </p>
@@ -112,7 +105,7 @@
               <li>Mulighed 4 "Ingen af ovennævnte"</li>
             </ul>
 
-   	    <table align="center">
+   	    <table class="vote">
               <tr>
                 <th colspan="5" style="text-align:center;">Mulighed</th>
 	      </tr>
@@ -170,6 +163,4 @@
 	      Mulighed 2 slår mulighed 4 med (394 - 70) = 324 stemmer.<br>
 	      Mulighed 3 slår mulighed 4 med (442 - 26) = 416 stemmer.
 	    </p>
-          </td>	    
-        </tr>
-      </table>
+
diff --git a/danish/vote/2005/index.wml b/danish/vote/2005/index.wml
index fce3bd76e2b..9541e45f52b 100644
--- a/danish/vote/2005/index.wml
+++ b/danish/vote/2005/index.wml
@@ -1,8 +1,8 @@
 <define-tag pagetitle>Sager taget op i 2005</define-tag>
-#use wml::debian::template title="<pagetitle>"
-#use wml::debian::translation-check translation="1.2"
+#use wml::debian::template title="<pagetitle>" NOHEADER="true"
+#use wml::debian::translation-check translation="1.3"
 #use wml::debian::recent_list
 #use wml::debian::votebar	
-#include "$(ENGLISHDIR)/vote/style.inc"
 
+<h1><pagetitle></h1>
 <:= get_recent_list('.', '0', '$(ENGLISHDIR)/vote/2005', 'list', 'vote_\d*') :>
diff --git a/danish/vote/2005/vote_001.wml b/danish/vote/2005/vote_001.wml
index 447880f905f..a62cabd7238 100644
--- a/danish/vote/2005/vote_001.wml
+++ b/danish/vote/2005/vote_001.wml
@@ -1,16 +1,15 @@
 <define-tag pagetitle>Debians projektledervalg 2005</define-tag>
 <define-tag status>F</define-tag>
 #use wml::debian::template title="<pagetitle>" BARETITLE="true" NOHEADER="true"
-#use wml::debian::translation-check translation="1.26"
+#use wml::debian::translation-check translation="1.27"
+#use wml::debian::toc
 #use wml::debian::votebar	
-#include "$(ENGLISHDIR)/vote/style.inc"
 
-    <h1 class="title">Debians projektledervalg 2005</h1>
-    <table class="mainbody">
-        <tr>
-          <td valign="top"><strong>Time Line</strong>:</td>
-          <td valign="top">
-            <table style="border-collapse: collapse; border: outset 2pt #8cacbb;">
+<h1><pagetitle></h1>
+<h2> </h2>
+<toc-display/>
+          <vtimeline />
+            <table class="vote">
                 <tr>
                   <th>Nomineringsperiode:</th>
                   <td>7. februar 2005, 00.00.01 UTC</td>
@@ -29,11 +28,9 @@
             </table>
             <p>Bemærk at den nye embedsperiode for projektlederen begynder
 	    den 17. april 2005.</p>
-          </td>
-        </tr>
-        <tr>
-          <td valign="top"><strong>Nominations</strong>:</td>
-          <td valign="top">
+
+
+          <vnominations />
             <ol>
 	              <li>Matthew Garrett [<email mjg59@debian.org>]
 			  [<a href="platforms/mjg59">program</a>]</li>
@@ -51,11 +48,9 @@
              <p>Når valgkortet er færdigt, kan det hentes via e-mail, ved at
 	     skrive til <a href="mailto:ballot@vote.debian.org">\
 	     ballot@vote.debian.org</a> med "leader2005" som emne.</p>
-          </td>
-        </tr>
-	<tr>
-	  <td valign="top"><strong>Debat</strong>:</td>
-	  <td valign="top">
+
+
+	  <vdebate />
             <p>
 	      I år var Helen Faulkner og Martin Krafft ordstyrere under 
 	      debatten.  En stor tak fra projektet for deres fremragende arbejde 
@@ -86,12 +81,10 @@
 		<li><a href="Log-debian-dpl-moderator.txt">#debian-dpl-moderator</a></li>
 		<li><a href="Log-debian-dpl-replies.txt">#debian-dpl-replies</a></li>
 	    </ul>
-	  </td>
-	</tr>
 
-        <tr>
-          <td valign="top"><strong>Data og statistikker</strong>:</td>
-          <td valign="top"> 
+
+          <vstatistics />
+          <p> 
 	     I år, som altid, vil nogle 
              <a href="leader2005_stats">statistikker</a> blive indsamlet om 
 	     modtagne stemmer og bekræftelser sendt der regelmæssigt sendes i 
@@ -104,11 +97,11 @@
 	     alias, frem for vedkommendes navn; de enkelte vælgere har modtaget 
 	     deres aliaser samtidig med bekræftelsen af deres stemme, så de kan 
 	     kontrollere at deres stemmer er optalt korrekt.
-         </td>
-        </tr>
-        <tr>
-          <td valign="top"><strong>Beslutningsdygtigt antal</strong>:</td>
-          <td valign="top">
+         </p>
+
+
+          <vquorum />
+          <p>
 	With <a href="vote_001.quorum.log">965 udviklere</a>,
 	we have:
             <pre>
@@ -124,11 +117,10 @@ Valgmulighed 4 opnåede beslutningsdygtigt antal: 390 > 46,5966737010272
 Valgmulighed 5 opnåede beslutningsdygtigt antal: 261 > 46,5966737010272	
 Valgmulighed 6 opnåede beslutningsdygtigt antal: 346 > 46,5966737010272
             </pre>
-	</td>
-        </tr>
-	<tr>
-	  <td valign="top"><strong>Flertalskrav</strong>:</td>
-	  <td valign="top">Alle kandidater skal have et simpelt flertal for at kunne vælges. 
+
+
+	  <vmajorityreq />
+	  <p>Alle kandidater skal have et simpelt flertal for at kunne vælges. 
              <pre>
 Dropper valgmulighed 1 pga. flertal.  0,332 (112/337) <= 1
 Valgmulighed 2 passerer flertal.      5,120 (384/75) > 1
@@ -137,11 +129,9 @@ Valgmulighed 4 passerer flertal.      3,861 (390/101) > 1
 Valgmulighed 5 passerer flertal.      1,418 (261/184) > 1
 Valgmulighed 6 passerer flertal.      2,883 (346/120) > 1
 	    </pre>
-	</td>
-	</tr>
-        <tr>
-          <td valign="top"><strong>Resultat</strong>:</td>
-          <td valign="top">
+
+
+          <voutcome />
      	      <h3>Valgets vinder er Branden Robinson</h3>
            <p>
 	      Tak til kandidaterne for deres vilje til at støtte projektet,
@@ -149,7 +139,7 @@ Valgmulighed 6 passerer flertal.      2,883 (346/120) > 1
 	      give udviklerne en stærk og forskelligartet gruppe af 
 	      kandidater.
            </p>
-           <p align="center">
+           <p class="center">
              <a style="margin-left: auto; margin-right: auto;" href="vote_001_results.dot">
                <img src="vote_001_results.png" alt="Grafisk præsentation af resultaterne">
                </a>
@@ -177,7 +167,7 @@ Valgmulighed 6 passerer flertal.      2,883 (346/120) > 1
              <li>Mulighed 6 "Andreas Schuldei"</li>
              <li>Mulighed 7 "Ingen af de nævnte"</li>
            </ul>
-    	       <table style="margin-left: auto;margin-right: auto;">
+    	       <table class="vote">
                  <caption style="margin-left: auto;margin-right: auto; text-align: center"><strong>Beat-matrix'en</strong></caption>
                   <tr>
                     <th colspan="8" style="text-align:center;">Mulighed</th>
@@ -305,6 +295,4 @@ modtog 18 stemmer frem for Matthew Garrett.
     	       <a href="$(HOME)/devel/constitution">vedtægterne</a>,
 	       helt specifitk i § A.6.
              </p>
-          </td>
-        </tr>
-    </table>
+
diff --git a/danish/vote/howto_follow.wml b/danish/vote/howto_follow.wml
index e05c19fdf6e..fdba0e0ebb0 100644
--- a/danish/vote/howto_follow.wml
+++ b/danish/vote/howto_follow.wml
@@ -1,9 +1,8 @@
 #use wml::debian::template title="Standard-beslutningsprocedure" BARETITLE="true" NOHEADER="true" NOHOMELINK="true"
 #use wml::debian::votebar
-#use wml::debian::translation-check translation="1.10"
-#include "$(ENGLISHDIR)/vote/style.inc"
+#use wml::debian::translation-check translation="1.11"
 
-<h1 class="title">Standard-beslutningsprocedure</h1>
+<h1>Standard-beslutningsprocedure</h1>
 
 <p>Et forslag kan stilles af enhver udvikler ved at sende en meddelelse til en
 kvalificeret liste.  En kvalificeret liste er enhver "offentlig tilgængelig 
diff --git a/danish/vote/howto_proposal.wml b/danish/vote/howto_proposal.wml
index 52d6928df11..3bdc6e42003 100644
--- a/danish/vote/howto_proposal.wml
+++ b/danish/vote/howto_proposal.wml
@@ -1,9 +1,8 @@
 #use wml::debian::template title="Debian-afstemning - Indsendelse af forslag" BARETITLE="true" NOHEADER="true" NOHOMELINK="true"
 #use wml::debian::votebar
-#use wml::debian::translation-check translation="1.16"
-#include "$(ENGLISHDIR)/vote/style.inc"
+#use wml::debian::translation-check translation="1.17"
 
-<h1 class="title">Retningslinier</h1>
+<h1>Retningslinier</h1>
 
 <p>Et forslag vil ikke blive diskvalificeret ved ikke at følge alle disse 
 trin.  Men betragt dem en hjælp til udviklerene, til at finde og forstå dit
@@ -73,4 +72,4 @@ støtter er enige i ændringerne.  Hvis nogen af dem er imod, skal ændringen have
 det samme antal støtter.  Når afstemningen vedrørende forslaget går i gang, 
 vælger forslagsstilleren af det oprindelige forslag, om der skal stemmes på 
 ændringerne hver for sig, alle på én gang, eller alle sammen med det 
-oprindelige forslag.</p>
\ No newline at end of file
+oprindelige forslag.</p>
diff --git a/danish/vote/index.wml b/danish/vote/index.wml
index 7cae57d3eaa..492994ee7a0 100644
--- a/danish/vote/index.wml
+++ b/danish/vote/index.wml
@@ -1,7 +1,6 @@
 #use wml::debian::template title="Debians afstemningsoplysninger" BARETITLE="true" NOHEADER="true" NOHOMELINK="true"
-#use wml::debian::translation-check translation="1.19"
+#use wml::debian::translation-check translation="1.20"
 #use wml::debian::votebar
-#include "$(ENGLISHDIR)/vote/style.inc"
 
 <h1 class="title">Debians afstemningsoplysninger</h1>
 
@@ -31,9 +30,11 @@ Wikipedia, som der linkes til, er ganske informativ).  Simplificeret kan
 Condorcets metode forklares som følger:</p>
 
 <blockquote>
+<p>
 Tag alle mulige tosidede opgør mellem kandidater i betragtning.
 Condorcet-vinderen, hvis der er en, er den kandidat som kan slå alle andre 
 kandidater i et tosidet opgør med denne kandidat.
+</p>
 </blockquote>
 
 <p>Problemet er, at i komplekse valg, kan der meget vel være en cirkulær