From 2ffa1f973ece6316e118663636f285a58a528416 Mon Sep 17 00:00:00 2001
From: "max.mehl" <max.mehl@fsfe.org>
Date: Thu, 25 Nov 2021 15:34:49 +0100
Subject: [PATCH] fix formatting

---
 contribute/promoitems/active-items.en.xml   | 119 +++---
 contribute/promoitems/archived-items.en.xml | 172 ++++-----
 contribute/spreadtheword.en.xhtml           | 377 ++++++++++----------
 3 files changed, 317 insertions(+), 351 deletions(-)

diff --git a/contribute/promoitems/active-items.en.xml b/contribute/promoitems/active-items.en.xml
index 8222ecacad..2fcfb34e11 100644
--- a/contribute/promoitems/active-items.en.xml
+++ b/contribute/promoitems/active-items.en.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 
 <!-- Do not translate this file! -->
 <!-- Please assign the attributes
@@ -21,197 +21,174 @@ Such an item doesn't need an image!
   <version>1</version>
 
 
-
   <!-- FSFE and Fellowship -->
 
   <item type="fsfe" id="fsfe-logo-sticker" year="2017" order="1">
- 	<image
-    imgsmall="/contribute/promopics/fsfe-sticker-thumb.png"/>
+    <image imgsmall="/contribute/promopics/fsfe-sticker-thumb.png" />
   </item>
 
   <item type="fsfe" id="fsfe-since-2001-sticker" year="2021" order="2">
- 	<image
-    imgsmall="/contribute/promopics/fsfe-since-2001-sticker-thumb.png"/>
+    <image imgsmall="/contribute/promopics/fsfe-since-2001-sticker-thumb.png" />
   </item>
 
 
   <!-- Free Software multilanguage -->
 
   <item type="fsfe" id="multilanguage-free-software-logocolours" year="2019" order="3">
-    <image imgsmall="/contribute/promopics/free-software-multilanguage-logocolours.png"/>
+    <image imgsmall="/contribute/promopics/free-software-multilanguage-logocolours.png" />
   </item>
 
   <item type="fsfe" id="multilanguage-free-software-purple" year="2019" order="4">
-    <image imgsmall="/contribute/promopics/free-software-multilanguage-purple.png"/>
+    <image imgsmall="/contribute/promopics/free-software-multilanguage-purple.png" />
   </item>
 
   <!-- Hacking 100 freedom -->
 
   <item type="fsfe" id="hacking-100-freedom-sticker-blue" year="2019" order="5">
-    <image imgsmall="/contribute/promopics/hacking-100-freedom-sticker-blue.png"/>
+    <image imgsmall="/contribute/promopics/hacking-100-freedom-sticker-blue.png" />
   </item>
 
   <item type="fsfe" id="hacking-100-freedom-sticker-darkblue" year="2019" order="6">
-    <image imgsmall="/contribute/promopics/hacking-100-freedom-sticker-darkblue.png"/>
+    <image imgsmall="/contribute/promopics/hacking-100-freedom-sticker-darkblue.png" />
   </item>
 
   <item type="fsfe" id="hacking-100-freedom-sticker-green" year="2019" order="7">
-    <image imgsmall="/contribute/promopics/hacking-100-freedom-sticker-green.png"/>
+    <image imgsmall="/contribute/promopics/hacking-100-freedom-sticker-green.png" />
   </item>
 
 
-    <!-- FS and users freedoms -->
+  <!-- FS and users freedoms -->
 
-    <item type="freedom" id="fs-and-tools" year="2014" order="0">
- 	<image
-    imgsmall="/contribute/promopics/freiheit-thumb.png"/>
+  <item type="freedom" id="fs-and-tools" year="2014" order="0">
+    <image imgsmall="/contribute/promopics/freiheit-thumb.png" />
   </item>
 
   <item type="freedom" id="gnupg-leaflet" year="2014" order="6">
- 	<image
-    imgsmall="/contribute/promopics/gnupg-leaflet-en-thumb.png"/>
+    <image imgsmall="/contribute/promopics/gnupg-leaflet-en-thumb.png" />
   </item>
 
   <item type="freedom" id="drm-leaflet" year="2012" order="7">
- 	<image
-    imgsmall="/contribute/promopics/drm_thumb.png"/>
+    <image imgsmall="/contribute/promopics/drm_thumb.png" />
   </item>
 
 
   <!--100 freedoms -->
 
-   <item type="freedom" id="100-freedoms-sticker-black" year="2017" order="1">
-    <image imgsmall="/contribute/promopics/100-freedoms-sticker-black.png"/>
+  <item type="freedom" id="100-freedoms-sticker-black" year="2017" order="1">
+    <image imgsmall="/contribute/promopics/100-freedoms-sticker-black.png" />
   </item>
 
   <item type="freedom" id="100-freedoms-sticker-orange" year="2017" order="2">
-    <image imgsmall="/contribute/promopics/100-freedoms-sticker-orange.png"/>
+    <image imgsmall="/contribute/promopics/100-freedoms-sticker-orange.png" />
   </item>
 
 
   <!-- Public Money, Public Code -->
 
   <item type="pmpc" id="pmpc-brochure" year="2019" order="1">
-    <image imgsmall="/contribute/promopics/pmpc_brochure_cover.jpg"/>
+    <image imgsmall="/contribute/promopics/pmpc_brochure_cover.jpg" />
   </item>
 
-    <item type="pmpc" id="pmpc-sticker-slogan" year="2018" order="1">
- 	<image
-    imgsmall="/contribute/promopics/PMPC_sticker_SLOGAN-thumb.png"/>
+  <item type="pmpc" id="pmpc-sticker-slogan" year="2018" order="1">
+    <image imgsmall="/contribute/promopics/PMPC_sticker_SLOGAN-thumb.png" />
   </item>
 
-    <item type="pmpc" id="pmpc-sticker-logo" year="2017" order="1">
- 	<image
-    imgsmall="/contribute/promopics/pmpc-logo-sticker-thumb.png"/>
+  <item type="pmpc" id="pmpc-sticker-logo" year="2017" order="1">
+    <image imgsmall="/contribute/promopics/pmpc-logo-sticker-thumb.png" />
   </item>
 
   <item type="pmpc" id="pmpc-postcard" year="2017" order="1">
-      <image imgsmall="/contribute/promopics/pmpc_postcard_front_thumb.png"/>
+    <image imgsmall="/contribute/promopics/pmpc_postcard_front_thumb.png" />
   </item>
 
   <item type="pmpc" id="pmpc-poster" year="2018" order="1">
-      <image imgsmall="/contribute/promopics/pmpc_poster_combined_thumb.png"/>
+    <image imgsmall="/contribute/promopics/pmpc_poster_combined_thumb.png" />
   </item>
 
 
-
   <!-- Document Freedom Day -->
 
   <item introduction="yes" type="dfd" id="dfd-introduction" order="1" /> <!-- introduction item with just text, doesn't need a picture -->
 
-    <item type="dfd" id="dfd-chance-poster" year="2014" order="4">
- 	<image
-    imgsmall="/contribute/promopics/a2.mu_thumb.png"/>
+  <item type="dfd" id="dfd-chance-poster" year="2014" order="4">
+    <image imgsmall="/contribute/promopics/a2.mu_thumb.png" />
   </item>
 
-    <item type="dfd" id="dfd-poster-open-format" year="2014" order="6">
- 	<image
-    imgsmall="/contribute/promopics/open_formats_poster_ENthumb.png"/>
+  <item type="dfd" id="dfd-poster-open-format" year="2014" order="6">
+    <image imgsmall="/contribute/promopics/open_formats_poster_ENthumb.png" />
   </item>
 
   <!-- Upcycling Android -->
 
   <item type="upcyclingandroid" id="ua-sticker-square" year="2021" order="1">
- 	<image
-    imgsmall="/contribute/promopics/ua-sticker-square-thumb.jpg"/>
+    <image imgsmall="/contribute/promopics/ua-sticker-square-thumb.jpg" />
   </item>
 
   <item type="upcyclingandroid" id="ua-sticker-round" year="2021" order="2">
- 	<image
-    imgsmall="/contribute/promopics/ua-sticker-round-thumb.png"/>
+    <image imgsmall="/contribute/promopics/ua-sticker-round-thumb.png" />
   </item>
 
 
-   <!-- F-droid -->
+  <!-- F-droid -->
   <item type="f-droid" id="f-droid-leaflet" year="2014" order="1">
- 	<image
-    imgsmall="/contribute/promopics/fdroid-flyer_thumb.png"/>
+    <image imgsmall="/contribute/promopics/fdroid-flyer_thumb.png" />
   </item>
 
   <item type="f-droid" id="fya-sticker" year="2017" order="2">
- 	<image
-    imgsmall="/contribute/promopics/fya-sticker-2012-3cm.png"/>
+    <image imgsmall="/contribute/promopics/fya-sticker-2012-3cm.png" />
   </item>
 
   <!-- I love Free Software -->
   <item type="ilovefs" id="ilovefs-postcard" year="2014" order="3">
-    <image imgsmall="/contribute/promopics/ilovefs-postcard-front-thumb.png"/>
+    <image imgsmall="/contribute/promopics/ilovefs-postcard-front-thumb.png" />
   </item>
 
   <item type="ilovefs" id="ilovefs-flyer" year="2014" order="2">
- 	<image
-    imgsmall="/contribute/promopics/ilovefs_flyer_A7_thumb.png"/>
+    <image imgsmall="/contribute/promopics/ilovefs_flyer_A7_thumb.png" />
   </item>
 
   <item type="ilovefs" id="ilovefs-sticker" year="2016" order="1">
- 	<image
-    imgsmall="/contribute/promopics/ilovefs-sticker_thumb.png"/>
+    <image imgsmall="/contribute/promopics/ilovefs-sticker_thumb.png" />
   </item>
 
   <item type="ilovefs" id="ilovefs-burgundy-sticker" year="2016" order="1">
-    <image imgsmall="/contribute/promopics/ilovefs-sticker_burgundy_thumb.png"/>
+    <image imgsmall="/contribute/promopics/ilovefs-sticker_burgundy_thumb.png" />
   </item>
 
-    <item type="ilovefs" id="ilovefs-poster-2sided" year="2014" order="4">
- 	<image
-    imgsmall="/contribute/promopics/ilovefs_poster_A1_thumb.png"/>
+  <item type="ilovefs" id="ilovefs-poster-2sided" year="2014" order="4">
+    <image imgsmall="/contribute/promopics/ilovefs_poster_A1_thumb.png" />
   </item>
 
-    <item type="ilovefs" id="ilovefs-balloon" year="2015" order="5">
- 	<image
-    imgsmall="/contribute/promopics/ilovefs-balloon-combined-thumb.png"/>
+  <item type="ilovefs" id="ilovefs-balloon" year="2015" order="5">
+    <image imgsmall="/contribute/promopics/ilovefs-balloon-combined-thumb.png" />
   </item>
 
   <!-- No cloud -->
 
-    <item type="nocloud" id="nocloud-sticker" year="2015" order="1">
- 	<image
-    imgsmall="/contribute/promopics/thereisnocloud-bluecolor-preview.png"/>
+  <item type="nocloud" id="nocloud-sticker" year="2015" order="1">
+    <image imgsmall="/contribute/promopics/thereisnocloud-bluecolor-preview.png" />
   </item>
 
-   <item type="nocloud" id="nocloud-sticker-bw" year="2017" order="2">
- 	<image
-    imgsmall="/contribute/promopics/thereisnocloud-bw-preview.png"/>
+  <item type="nocloud" id="nocloud-sticker-bw" year="2017" order="2">
+    <image imgsmall="/contribute/promopics/thereisnocloud-bw-preview.png" />
   </item>
 
   <item type="nocloud" id="nocloud-postcard" year="2014" order="3">
- 	 <image
-     imgsmall="/contribute/promopics/thereisnocloud-postcard-thumb.png"/>
+    <image imgsmall="/contribute/promopics/thereisnocloud-postcard-thumb.png" />
   </item>
 
   <item type="nocloud" id="nocloud-poster-2sided" year="2015" order="4">
- 	<image
-    imgsmall="/contribute/promopics/thereisnocloud-poster-thumb.png"/>
+    <image imgsmall="/contribute/promopics/thereisnocloud-poster-thumb.png" />
   </item>
 
   <!-- Children's Book Ada+Zangemann -->
 
   <item type="childrensbook" id="childrensbook-sticker-ada" year="2021" order="1">
-    <image imgsmall="/contribute/promopics/childrensbook-sticker-ada-thumb.png"/>
+    <image imgsmall="/contribute/promopics/childrensbook-sticker-ada-thumb.png" />
   </item>
 
   <item type="childrensbook" id="childrensbook-sticker-zangemann" year="2021" order="2">
-    <image imgsmall="/contribute/promopics/childrensbook-sticker-zangemann-thumb.png"/>
+    <image imgsmall="/contribute/promopics/childrensbook-sticker-zangemann-thumb.png" />
   </item>
 
 </itemset>
diff --git a/contribute/promoitems/archived-items.en.xml b/contribute/promoitems/archived-items.en.xml
index 8d58139335..2734c61ba8 100644
--- a/contribute/promoitems/archived-items.en.xml
+++ b/contribute/promoitems/archived-items.en.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 
 <!-- Do not translate this file! -->
-<!-- Please assign the attributes 
-  id (vebose ID of item), 
-  type (category like dfd, fya...), 
-  year (year of first production) and 
-  order (place of appearance in respective category) 
+<!-- Please assign the attributes
+  id (vebose ID of item),
+  type (category like dfd, fya...),
+  year (year of first production) and
+  order (place of appearance in respective category)
 to every item in this file -->
 
 <itemset>
@@ -14,126 +14,104 @@ to every item in this file -->
 
   <!-- FSFE and Fellowship -->
   <item type="fsfe" id="fellowship-leaflet" year="2008" order="1">
- 	<image
-    imgsmall="/contribute/promopics/fellowship-leaflet-thumb.png"/>
+    <image imgsmall="/contribute/promopics/fellowship-leaflet-thumb.png" />
   </item>
 
   <item type="fsfe" id="fsfe-folder" year="2005" order="2">
- 	<image
-    imgsmall="/contribute/promopics/folder-fsfe-en1_thumb.png"/>
+    <image imgsmall="/contribute/promopics/folder-fsfe-en1_thumb.png" />
   </item>
-  
-    <item type="fsfe" id="fellowship-poster" year="2008" order="4">
- 	<image
-    imgsmall="/contribute/promopics/joinfellowship-poster_thumb.png"/>
-  </item>  
-  
+
+  <item type="fsfe" id="fellowship-poster" year="2008" order="4">
+    <image imgsmall="/contribute/promopics/joinfellowship-poster_thumb.png" />
+  </item>
+
   <item type="fsfe" id="15y-fsfe-sticker" year="2016" order="2">
- 	<image
-    imgsmall="/contribute/promopics/FSFE_15_Sticker_en_thumb.png"/>
-  </item> 
- 
+    <image imgsmall="/contribute/promopics/FSFE_15_Sticker_en_thumb.png" />
+  </item>
+
   <item type="fsfe" id="plussy-sticker" year="2005" order="3">
- 	<image
-    imgsmall="/contribute/promopics/plussy-sticker-thumb.png"/>
-  </item> 
+    <image imgsmall="/contribute/promopics/plussy-sticker-thumb.png" />
+  </item>
 
   <!-- Free Software and users freedom -->
   <item type="fsfreedom" id="nocloud-sticker" year="2015" order="1">
- 	<image
-    imgsmall="/contribute/promopics/thereisnocloud_thumb.png"/>
+    <image imgsmall="/contribute/promopics/thereisnocloud_thumb.png" />
   </item>
-  
+
   <!-- Free Your Android -->
-  
-    <item type="f-droid" id="f-droid-flyer" year="2014" order="">
- 	<image
-    imgsmall="/contribute/promopics/fya-flyer-en_thumb.png"/>
+
+  <item type="f-droid" id="f-droid-flyer" year="2014" order="">
+    <image imgsmall="/contribute/promopics/fya-flyer-en_thumb.png" />
   </item>
-  
+
   <item type="f-droid" id="f-droid-poster" year="2014" order="2">
- 	<image
-    imgsmall="/contribute/promopics/fya-poster_thumb.png"/>
-  </item> 
-  
+    <image imgsmall="/contribute/promopics/fya-poster_thumb.png" />
+  </item>
+
   <!-- No Cloud -->
-  
+
   <item type="nocloud" id="nocloud-poster" year="2015" order="4">
- 	<image
-    imgsmall="/contribute/promopics/thereisnocloud-poster-thumb.png"/>
-  </item>  
-  
-  
-     <!-- They Dont Want You.To -->
+    <image imgsmall="/contribute/promopics/thereisnocloud-poster-thumb.png" />
+  </item>
+
+
+  <!-- They Dont Want You.To -->
   <item type="tdwyt" id="tdwyt-sticker" year="2012" order="1">
- 	<image
-    imgsmall="/contribute/promopics/tdwyt-laptop-thumb.png"/>
-  </item> 
- 
+    <image imgsmall="/contribute/promopics/tdwyt-laptop-thumb.png" />
+  </item>
+
   <item type="tdwyt" id="tdwyt-sticker-big" year="2012" order="2">
- 	<image
-    imgsmall="/contribute/promopics/tdwyt-billboard-small-thumb.png"/>
-  </item>   
+    <image imgsmall="/contribute/promopics/tdwyt-billboard-small-thumb.png" />
+  </item>
 
   <item type="tdwyt" id="tdwyt-sticker-triangle" year="2012" order="3">
- 	<image
-    imgsmall="/contribute/promopics/tdwyt-triangle-thumb.png"/>
-  </item>   
-  
-  <!-- Document Freedom Day -->
-  
-  <item type="dfd" id="dfd-cartoon" year="2014" order="20">
- 	<image
-    imgsmall="/contribute/promopics/cartoon.en.png"/>
-  </item>
-  
-    <item type="dfd" id="dfd-leaflet" year="2014" order="1">
- 	<image
-    imgsmall="/contribute/promopics/dfd-leaflet_thumb.png"/>
-  </item>
-  
-  <item type="dfd" id="dfd-os-sticker" year="2014" order="2">
-  <image
-    imgsmall="/contribute/promopics/dfd-protest-robots-stickers_thumb.png"/>
-  </item>
-  
-  <item type="dfd" id="dfd-os-sticker-big" year="2014" order="3">
-  <image
-    imgsmall="/contribute/promopics/dfd-protest-robots-stickers_thumb.png"/>
-  </item>
-  
-    <item type="dfd" id="dfd-cartoon" year="2014" order="7">
- 	<image
-    imgsmall="/contribute/promopics/cartoon.en.png"/>
+    <image imgsmall="/contribute/promopics/tdwyt-triangle-thumb.png" />
   </item>
 
-     <item type="dfd" id="dfd-wcryd" year="2014" order="8">
- 	<image
-    imgsmall="/contribute/promopics/wcryd-sticker-thumb.png"/>
+  <!-- Document Freedom Day -->
+
+  <item type="dfd" id="dfd-cartoon" year="2014" order="20">
+    <image imgsmall="/contribute/promopics/cartoon.en.png" />
   </item>
-  
+
+  <item type="dfd" id="dfd-leaflet" year="2014" order="1">
+    <image imgsmall="/contribute/promopics/dfd-leaflet_thumb.png" />
+  </item>
+
+  <item type="dfd" id="dfd-os-sticker" year="2014" order="2">
+    <image imgsmall="/contribute/promopics/dfd-protest-robots-stickers_thumb.png" />
+  </item>
+
+  <item type="dfd" id="dfd-os-sticker-big" year="2014" order="3">
+    <image imgsmall="/contribute/promopics/dfd-protest-robots-stickers_thumb.png" />
+  </item>
+
+  <item type="dfd" id="dfd-cartoon" year="2014" order="7">
+    <image imgsmall="/contribute/promopics/cartoon.en.png" />
+  </item>
+
+  <item type="dfd" id="dfd-wcryd" year="2014" order="8">
+    <image imgsmall="/contribute/promopics/wcryd-sticker-thumb.png" />
+  </item>
+
   <item type="dfd" id="dfd-flyer" year="2015" order="5">
-  <image
-    imgsmall="/contribute/promopics/dfd-2015-a7-front-mu.png"/>
+    <image imgsmall="/contribute/promopics/dfd-2015-a7-front-mu.png" />
   </item>
-  
-    <item type="dfd" id="dfd-postcard" year="2015" order="9">
- 	<image
-    imgsmall="/contribute/promopics/dfd-robots-postcard_thumb.png"/>
+
+  <item type="dfd" id="dfd-postcard" year="2015" order="9">
+    <image imgsmall="/contribute/promopics/dfd-robots-postcard_thumb.png" />
   </item>
-  
+
   <!-- FS and users freedoms -->
-  
-    <item type="hackingforfreedom" id="hacking-for-freedom-sticker-v2" year="2017" order="4">
- 	<image
-    imgsmall="/contribute/promopics/hacking-for-freedom-sticker-v2-thumb.png"/>
+
+  <item type="hackingforfreedom" id="hacking-for-freedom-sticker-v2" year="2017" order="4">
+    <image imgsmall="/contribute/promopics/hacking-for-freedom-sticker-v2-thumb.png" />
   </item>
 
   <!-- I love Free Software -->
 
-    <item type="ilovefs" id="ilovefs-poster" year="2014" order="4">
- 	<image
-    imgsmall="/contribute/promopics/ilovefs_poster_A1_thumb.png"/>
-  </item> 
+  <item type="ilovefs" id="ilovefs-poster" year="2014" order="4">
+    <image imgsmall="/contribute/promopics/ilovefs_poster_A1_thumb.png" />
+  </item>
 
 </itemset>
diff --git a/contribute/spreadtheword.en.xhtml b/contribute/spreadtheword.en.xhtml
index 3e46130b7e..c34e42dd86 100644
--- a/contribute/spreadtheword.en.xhtml
+++ b/contribute/spreadtheword.en.xhtml
@@ -3,234 +3,245 @@
 <html>
   <version>3</version>
 
-	<head>
-		<title>Spread the word</title>
+  <head>
+    <title>Spread the word</title>
 
-	</head>
+  </head>
 
-	<body class="spreadtheword">
-		<p id="category"><a href="/contribute/">Contribute</a></p>
+  <body class="spreadtheword">
+    <p id="category"><a href="/contribute/">Contribute</a></p>
 
-		<h1 id="spread-the-word">Spread the word!</h1>
+    <h1 id="spread-the-word">Spread the word!</h1>
 
     <module id="order-delay"/>
 
-		<div id="toc">
-			<p class="head"><strong><a href="#how-to-order">Order now</a></strong></p>
+    <div id="toc">
+      <p class="head"><strong><a href="#how-to-order">Order now</a></strong></p>
 
-		  <p><strong>Available promotion material</strong></p>
-		  <ul>
-		    <li><a href="#fsfe-and-community">FSFE and our community</a></li>
-		    <li><a href="#freedom">Free Software and User Freedom</a></li>
+      <p><strong>Available promotion material</strong></p>
+      <ul>
+        <li><a href="#fsfe-and-community">FSFE and our community</a></li>
+        <li><a href="#freedom">Free Software and User Freedom</a></li>
         <li><a href="#pmpc">"Public Money, Public Code" - campaign</a></li>
         <li><a href="#upcyclingandroid">"Upcycling Android" - campaign</a></li>
-		    <li><a href="#f-droid">"Free Your Android" - campaign</a></li>
-		    <li><a href="#ilovefs">"I love Free Software" - campaign</a></li>
-		    <li><a href="#childrensbook">Children's Book "Ada &amp; Zangemann"</a></li>
-		    <li><a href="#nocloud">"There is no cloud ..." - campaign</a></li>
-		    <li><a href="#dfd">"Document Freedom Day"- campaign</a></li>
+        <li><a href="#f-droid">"Free Your Android" - campaign</a></li>
+        <li><a href="#ilovefs">"I love Free Software" - campaign</a></li>
+        <li><a href="#childrensbook">Children's Book "Ada &amp; Zangemann"</a></li>
+        <li><a href="#nocloud">"There is no cloud ..." - campaign</a></li>
+        <li><a href="#dfd">"Document Freedom Day"- campaign</a></li>
 
-		  </ul>
-		  <p><strong>Behind the scenes</strong></p>
-		  <ul>
+      </ul>
+      <p><strong>Behind the scenes</strong></p>
+      <ul>
         <li><a href="#feedback">Any Feedback?</a></li>
         <li><a href="#archives">Our Archive</a></li>
         <li><a href="#upcoming">Upcoming promotion and campaigns</a></li>
-		  </ul>
-		</div>
+      </ul>
+    </div>
 
-		<h2 id="promo-material" class="noclear">FSFE Promotion Material</h2>
+    <h2 id="promo-material" class="noclear">FSFE Promotion Material</h2>
 
-		<p>
-			Are you going to a Free Software meeting or are you even organising one? Maybe you like to promote Free Software and the work of the FSFE around your friends and colleagues or at some public event? There are various reasons why and when you might like to receive promotion material for Free Software and the FSFE. Whatever it might be, we will be happy to send you our printed promotion material for <strong>no cost</strong>.<br/> On this page, you find an overview about our material and details about each product.</p>
+    <p>
+      Are you going to a Free Software meeting or are you even organising one?
+      Maybe you like to promote Free Software and the work of the FSFE around
+      your friends and colleagues or at some public event? There are various
+      reasons why and when you might like to receive promotion material for Free
+      Software and the FSFE. Whatever it might be, we will be happy to send you
+      our printed promotion material for <strong>no cost</strong>.<br/> On this
+      page, you find an overview about our material and details about each
+      product.
+    </p>
 
 
-		<h2 id="how-to-order" class="noclear">How to order</h2>
+    <h2 id="how-to-order" class="noclear">How to order</h2>
 
-			<p>
-			To order promotion material please use the following order form. You can order our default package or individual quantities and tell us explicitly what kind of promotion material you need or prefer. Feel free to decide for yourself. However, please keep in mind, that for postal reasons, in general we just send packages up to 1kg and only within European Economic Area (EEA). If you need more, please ask in advance.
-			</p>
+    <p>
+      To order promotion material please use the following order form. You can
+      order our default package or individual quantities and tell us
+      explicitly what kind of promotion material you need or prefer. Feel free
+      to decide for yourself. However, please keep in mind, that for postal
+      reasons, in general we just send packages up to 1kg and only within
+      European Economic Area (EEA). If you need more, please ask in advance.
+    </p>
 
 
-			<form class="highlight labeledform form-inline" id="orderpromo" method="post" action="/cgi-bin/promotion.php" accept-charset="utf-8">
-        <add-language/>
-        <h3>Order promotional material</h3>
-        <p>Fields marked with * are mandatory.</p>
-        <fieldset>
-          <legend>Your address</legend>
-          <div>
-            <span class="formlabel">First name, Last name*:</span>
-            <input type="text" name="firstname" placeholder="First Name" size="15"/>
-            <input type="text" name="lastname" placeholder="Last Name" size="15" required="required"/>
-          </div>
-          <div>
-            <span class="formlabel">Email*:</span>
-            <input type="email" name="mail" placeholder="Email" size="20" required="required"/>
-          </div>
-          <div>
-            <span class="formlabel">Company/Organisation (if any):</span>
-            <input type="text" name="org" placeholder="Organisation" size="20"/>
-          </div>
-          <div>
-            <span class="formlabel">Street, No.*:</span>
-            <input type="text" name="street" size="20" required="required"/>
-          </div>
-          <div>
-            <span class="formlabel">Zip*, City*:</span>
-            <input type="text" name="zip" size="5" required="required"/>
-            <input type="text" name="city" size="15" required="required"/>
-          </div>
-          <div>
-            <span class="formlabel">Country*:</span>
-            <country-list/>
-          </div>
-        </fieldset>
-        <fieldset>
-          <legend>Compose your package</legend>
-          <div>
-            <span class="formlabel">Package selection*:</span>
-            <label for="default"><input type="radio" name="packagetype" id="default" value="default" required="required"/>Default: Something from everything listed here, depending on size, language selection and availability. Select <em>Custom</em> if you would like to set preferences.</label>
-            <div>
-              <label for="custom"><input type="radio" name="packagetype" id="custom" value="custom" required="required"/>Custom: You can set preferences, e.g. specific campaigns or the type of promotion materials. Unfortunately we cannot guarantee to fulfill all wishes.
-              <div class="reveal">
-                <textarea name="specifics" rows="6" cols="40" placeholder="For example: Only leaflets explaining Free Software, no posters..."/>
-              </div>
-              </label>
-            </div>
-          </div>
-          <div>
-            <span class="formlabel">I would like to use the material for (short description)*:</span>
-            <textarea name="usage" rows="4" cols="40" placeholder="For example: Spreading information about Free Software in my surrounding, on event XYZ..." required="required"/>
-          </div>
-          <div class="langselector">
-            <span class="formlabel">My language preferences (we cannot guarantee availability):</span>
-            <ul>
-              <!-- Translators: No need to translate here, we use the native names -->
-              <!-- If you want to extend, please iterate the number behind "lang" accordingly -->
-              <li><label for="lang1"><input type="checkbox" name="languages[]" id="lang1" value="en" checked="checked"/>English</label></li>
-              <li><label for="lang2"><input type="checkbox" name="languages[]" id="lang2" value="cn"/>中文</label></li>
-              <li><label for="lang3"><input type="checkbox" name="languages[]" id="lang3" value="de"/>Deutsch</label></li>
-              <li><label for="lang4"><input type="checkbox" name="languages[]" id="lang4" value="el"/>Eλληνικά</label></li>
-              <li><label for="lang5"><input type="checkbox" name="languages[]" id="lang5" value="es"/>Español</label></li>
-              <li><label for="lang6"><input type="checkbox" name="languages[]" id="lang6" value="fr"/>Français</label></li>
-              <li><label for="lang7"><input type="checkbox" name="languages[]" id="lang7" value="it"/>Italiano</label></li>
-              <li><label for="lang8"><input type="checkbox" name="languages[]" id="lang8" value="lt"/>Latviešu</label></li>
-              <li><label for="lang9"><input type="checkbox" name="languages[]" id="lang9" value="nl"/>Nederlands</label></li>
-              <li><label for="lang10"><input type="checkbox" name="languages[]" id="lang10" value="pl"/>Polski</label></li>
-              <li><label for="lang11"><input type="checkbox" name="languages[]" id="lang11" value="ru"/>Русский</label></li>
-              <li><label for="lang12"><input type="checkbox" name="languages[]" id="lang12" value="sq"/>Shqip</label></li>
-              <li><label for="lang13"><input type="checkbox" name="languages[]" id="lang13" value="sr"/> Српски / srpski</label></li>
-              <li><label for="lang14"><input type="checkbox" name="languages[]" id="lang14" value="fi"/>Suomi</label></li>
-              <li><label for="lang15"><input type="checkbox" name="languages[]" id="lang15" value="tr"/>Türkçe</label></li>
-            </ul>
-          </div>
-        </fieldset>
-        <fieldset>
-          <legend>Last steps</legend>
-          <div>
-            <span class="formlabel">Additional comment:</span>
-            <textarea name="comment" rows="2" cols="40"/>
-          </div>
-          <div>
-            <input type="text" name="address" placeholder="Which address shall be used?" size="20" class="special"/>
-          </div>
-          <div>
-            <span class="formlabel">Receive the latest Free Software news:</span>
-            <label for="subcd"><input name="subcd" id="subcd" value="y" type="checkbox"/>I want to receive occasional information about the FSFE's activities</label>
-            <label for="subnl"><input name="subnl" id="subnl" value="y" type="checkbox"/>I want to receive the FSFE's monthly newsletter</label>
-          </div>
-          <div id="donate-group" class="form-group">
-            <span class="formlabel">Support our work with a voluntary donation*:</span>
-            <div class="input-group">
-              <input id="donate" name="donate" type="number" class="form-control " value="" placeholder="0 or ≥ 10 €" min="0" required="required"/>
-              <div class="input-group-addon">€</div>
-            </div>
-            <div id="donate-error" class="help-block" style="display: none;">
-              If you want to make a donation please enter at least 10 €.<br/>
-              If you don't want to donate please enter 0 €.
-            </div>
-          </div>
-        </fieldset>
+    <form class="highlight labeledform form-inline" id="orderpromo" method="post" action="/cgi-bin/promotion.php" accept-charset="utf-8">
+      <add-language/>
+      <h3>Order promotional material</h3>
+      <p>Fields marked with * are mandatory.</p>
+      <fieldset>
+        <legend>Your address</legend>
         <div>
-          <!-- Translators: please translate the label of this button (the value field) -->
-          <input type="submit" name="dothis" value="Order now!"/>
+          <span class="formlabel">First name, Last name*:</span>
+          <input type="text" name="firstname" placeholder="First Name" size="15"/>
+          <input type="text" name="lastname" placeholder="Last Name" size="15" required="required"/>
         </div>
-      </form>
+        <div>
+          <span class="formlabel">Email*:</span>
+          <input type="email" name="mail" placeholder="Email" size="20" required="required"/>
+        </div>
+        <div>
+          <span class="formlabel">Company/Organisation (if any):</span>
+          <input type="text" name="org" placeholder="Organisation" size="20"/>
+        </div>
+        <div>
+          <span class="formlabel">Street, No.*:</span>
+          <input type="text" name="street" size="20" required="required"/>
+        </div>
+        <div>
+          <span class="formlabel">Zip*, City*:</span>
+          <input type="text" name="zip" size="5" required="required"/>
+          <input type="text" name="city" size="15" required="required"/>
+        </div>
+        <div>
+          <span class="formlabel">Country*:</span>
+          <country-list/>
+        </div>
+      </fieldset>
+      <fieldset>
+        <legend>Compose your package</legend>
+        <div>
+          <span class="formlabel">Package selection*:</span>
+          <label for="default"><input type="radio" name="packagetype" id="default" value="default" required="required"/>Default: Something from everything listed here, depending on size, language selection and availability. Select <em>Custom</em> if you would like to set preferences.</label>
+          <div>
+            <label for="custom"><input type="radio" name="packagetype" id="custom" value="custom" required="required"/>Custom: You can set preferences, e.g. specific campaigns or the type of promotion materials. Unfortunately we cannot guarantee to fulfill all wishes.
+            <div class="reveal">
+              <textarea name="specifics" rows="6" cols="40" placeholder="For example: Only leaflets explaining Free Software, no posters..."/>
+            </div>
+            </label>
+          </div>
+        </div>
+        <div>
+          <span class="formlabel">I would like to use the material for (short description)*:</span>
+          <textarea name="usage" rows="4" cols="40" placeholder="For example: Spreading information about Free Software in my surrounding, on event XYZ..." required="required"/>
+        </div>
+        <div class="langselector">
+          <span class="formlabel">My language preferences (we cannot guarantee availability):</span>
+          <ul>
+            <!-- Translators: No need to translate here, we use the native names -->
+            <!-- If you want to extend, please iterate the number behind "lang" accordingly -->
+            <li><label for="lang1"><input type="checkbox" name="languages[]" id="lang1" value="en" checked="checked"/>English</label></li>
+            <li><label for="lang2"><input type="checkbox" name="languages[]" id="lang2" value="cn"/>中文</label></li>
+            <li><label for="lang3"><input type="checkbox" name="languages[]" id="lang3" value="de"/>Deutsch</label></li>
+            <li><label for="lang4"><input type="checkbox" name="languages[]" id="lang4" value="el"/>Eλληνικά</label></li>
+            <li><label for="lang5"><input type="checkbox" name="languages[]" id="lang5" value="es"/>Español</label></li>
+            <li><label for="lang6"><input type="checkbox" name="languages[]" id="lang6" value="fr"/>Français</label></li>
+            <li><label for="lang7"><input type="checkbox" name="languages[]" id="lang7" value="it"/>Italiano</label></li>
+            <li><label for="lang8"><input type="checkbox" name="languages[]" id="lang8" value="lt"/>Latviešu</label></li>
+            <li><label for="lang9"><input type="checkbox" name="languages[]" id="lang9" value="nl"/>Nederlands</label></li>
+            <li><label for="lang10"><input type="checkbox" name="languages[]" id="lang10" value="pl"/>Polski</label></li>
+            <li><label for="lang11"><input type="checkbox" name="languages[]" id="lang11" value="ru"/>Русский</label></li>
+            <li><label for="lang12"><input type="checkbox" name="languages[]" id="lang12" value="sq"/>Shqip</label></li>
+            <li><label for="lang13"><input type="checkbox" name="languages[]" id="lang13" value="sr"/> Српски / srpski</label></li>
+            <li><label for="lang14"><input type="checkbox" name="languages[]" id="lang14" value="fi"/>Suomi</label></li>
+            <li><label for="lang15"><input type="checkbox" name="languages[]" id="lang15" value="tr"/>Türkçe</label></li>
+          </ul>
+        </div>
+      </fieldset>
+      <fieldset>
+        <legend>Last steps</legend>
+        <div>
+          <span class="formlabel">Additional comment:</span>
+          <textarea name="comment" rows="2" cols="40"/>
+        </div>
+        <div>
+          <input type="text" name="address" placeholder="Which address shall be used?" size="20" class="special"/>
+        </div>
+        <div>
+          <span class="formlabel">Receive the latest Free Software news:</span>
+          <label for="subcd"><input name="subcd" id="subcd" value="y" type="checkbox"/>I want to receive occasional information about the FSFE's activities</label>
+          <label for="subnl"><input name="subnl" id="subnl" value="y" type="checkbox"/>I want to receive the FSFE's monthly newsletter</label>
+        </div>
+        <div id="donate-group" class="form-group">
+          <span class="formlabel">Support our work with a voluntary donation*:</span>
+          <div class="input-group">
+            <input id="donate" name="donate" type="number" class="form-control " value="" placeholder="0 or ≥ 10 €" min="0" required="required"/>
+            <div class="input-group-addon">€</div>
+          </div>
+          <div id="donate-error" class="help-block" style="display: none;">
+            If you want to make a donation please enter at least 10 €.<br/>
+            If you don't want to donate please enter 0 €.
+          </div>
+        </div>
+      </fieldset>
+      <div>
+        <!-- Translators: please translate the label of this button (the value field) -->
+        <input type="submit" name="dothis" value="Order now!"/>
+      </div>
+    </form>
 
 
-		<h1 id="available-promotion-material" style="margin-top:3em;">Available promotion material</h1>
+    <h1 id="available-promotion-material" style="margin-top:3em;">Available promotion material</h1>
 
-<!-- START ITEMIZE TESTING -->
+    <!-- START ITEMIZE -->
+    <h2 id="fsfe-and-community" class="left break">FSFE and our community</h2>
+    <dynamic-content type="fsfe"/>
 
-		<h2 id="fsfe-and-community" class="left break">FSFE and our community</h2>
-
-		<dynamic-content type="fsfe"/>
-
-		<h2 id="freedom" class="left break">Free Software and User Freedom</h2>
-
-		<dynamic-content type="freedom"/>
-        <dynamic-content type="hackingforfreedom"/>
+    <h2 id="freedom" class="left break">Free Software and User Freedom</h2>
+    <dynamic-content type="freedom"/>
+    <dynamic-content type="hackingforfreedom"/>
 
     <h2 id="pmpc" class="left break">Public Money, Public Code</h2>
-
     <dynamic-content type="pmpc"/>
 
     <h2 id="upcyclingandroid" class="left break">Upcycling Android</h2>
-
-		<dynamic-content type="upcyclingandroid"/>
+    <dynamic-content type="upcyclingandroid"/>
 
     <h2 id="f-droid" class="left break">Free Your Android</h2>
+    <dynamic-content type="f-droid"/>
 
-		<dynamic-content type="f-droid"/>
+    <h2 id="ilovefs" class="left break">I love Free Software</h2>
+    <dynamic-content type="ilovefs"/>
 
-		<h2 id="ilovefs" class="left break">I love Free Software</h2>
+    <h2 id="childrensbook" class="left break">Children's Book Ada &amp; Zangemann</h2>
+    <dynamic-content type="childrensbook"/>
 
-		<dynamic-content type="ilovefs"/>
+    <h2 id="nocloud" class="left break">There is no cloud</h2>
+    <dynamic-content type="nocloud"/>
 
-		<h2 id="childrensbook" class="left break">Children's Book Ada &amp; Zangemann</h2>
-
-		<dynamic-content type="childrensbook"/>
-
-		<h2 id="nocloud" class="left break">There is no cloud</h2>
-
-		<dynamic-content type="nocloud"/>
-
-		<h2 id="dfd" class="left break">Document Freedom Day</h2>
-
-		<dynamic-content type="dfd"/>
+    <h2 id="dfd" class="left break">Document Freedom Day</h2>
+    <dynamic-content type="dfd"/>
+    <!-- END ITEMIZE -->
 
 
+    <h2 id="feedback" class="left break">Any feedback?</h2>
 
-<!-- END ITEMIZE TESTING -->
+    <p class="left break">
+      Did you experience any trouble with your order, found a typo in our text,
+      you have a remark or an idea for upcoming promotion material? Or you just
+      like to send us a motivating message? Please <a
+      href="mailto:contact@fsfe.org">share your feedback</a> with us.
+    </p>
 
-	<h2 id="feedback" class="left break">Any feedback?</h2>
-	<p class="left break">
-		Did you experience any trouble with your order, found a typo in our text, you have a remark or an idea for upcoming promotion material? Or you just like to send us a motivating message? Please <a href="mailto:contact@fsfe.org">share your feedback</a> with us.</p>
+    <p class="left break">
+      We are always eager to hear some nice stories or to see pictures that you
+      have with our promotion material. Many people also share their experience
+      and pictures via social media with us.
+    </p>
 
-		<p class="left break">We are always eager to hear some nice stories or to see pictures that you have with our promotion material. Many people also share their experience and pictures via social media with us. </p>
+    <h2 id="archives" class="left break">Promotion Material Archive</h2>
 
+    <p class="left break">
+      Sometimes, parts of our promotion material section get outdated. This
+      might be the case, for example, when specific campaign runs out. However,
+      you can find and still download older material in our <a
+      href="/contribute/promotion-materials-archive">promotion material
+      archive.</a>
+    </p>
 
+    <h2 id="upcoming" class="left break">Upcoming promotion and campaigns</h2>
 
-	<h2 id="archives" class="left break">Promotion Material Archive</h2>
-	<p class="left break">
-	Sometimes, parts of our promotion material section get outdated. This might be
-	the case, for example, when specific campaign runs out. However, you can find
-	and still download older material in our <a href="/contribute/promotion-materials-archive">promotion material
-	archive.</a></p>
+    <p class="left break">
+      From time to time, have a look at this page again for new promotional
+      material - we will continue to update it. If you would like to help making
+      new designs or improve old ones, join the <a
+      href="/contribute/designers/designers">designers team</a>. Or if you would
+      like to add translations of pages or materials, join the <a
+      href="/contribute/translators/translators">translators team</a>.
+    </p>
 
+    <script src="/scripts/spreadtheword.js"/>
 
-	<h2 id="upcoming" class="left break">Upcoming promotion and campaigns</h2>
-
-	<p class="left break">From time to time, have a look at this page again for new promotional material - we will continue to update it. If you would like to help making new designs or improve old ones, join the <a href="/contribute/designers/designers">designers team</a>. Or if you would like to add translations of pages or materials, join the <a href="/contribute/translators/translators">translators team</a>.
-	</p>
-
-  <script src="/scripts/spreadtheword.js"/>
-
-	</body>
-	<description>FSFE's Promotion Material</description>
+  </body>
+<description>FSFE's Promotion Material</description>
 </html>
-<!--
-Local Variables: ***
-mode: xml ***
-End: ***
--->