the big commit to upload what i worked on on the test site

svn path=/trunk/; revision=35630

contribute/promoitems/active-items.en.xml

@@ -49,6 +49,11 @@ Such an item doesn't need an image!
     imgsmall="/contribute/promopics/drm_thumb.png"/>
   </item>
   
+      <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>
+  
   <!-- Document Freedom Day -->
   
   <item introduction="yes" type="dfd" id="dfd-introduction" order="1" /> <!-- introduction item with just text, doesn't need a picture -->
@@ -98,6 +103,11 @@ Such an item doesn't need an 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> 
+  
   <!-- No cloud -->
   
     <item type="nocloud" id="nocloud-sticker" year="2015" order="1">
@@ -118,14 +128,6 @@ Such an item doesn't need an image!
   <item type="nocloud" id="nocloud-poster-2sided" year="2015" order="4">
  	<image
     imgsmall="/contribute/promopics/thereisnocloud-poster-thumb.png"/>
-  </item>
-  
-    <!-- Hacking for Freedom -->
-  
-    <item type="hackingforfreedom" id="hacking-for-freedom-sticker-v2" year="2017" order="1">
- 	<image
-    imgsmall="/contribute/promopics/hacking-for-freedom-sticker-v2-thumb.png"/>
-  </item>
-  
+  </item> 
 
 </itemset>

contribute/promoitems/info-dfd-open-formats-poster.en.xml

@@ -15,7 +15,10 @@
     <size>A3 (29,5 x 42 cm)</size>
     <context><a href="http://www.documentfreedom.org/">Document Freedom Day</a></context>
     <languages>
-		<a href="http://download.fsfe.org/advocacy/promomaterial/DFD/open_formats_poster_A3_EN_FR_v2.pdf" title="Open Formats Poster">English &amp; Français</a>
+		<a href="http://download.fsfe.org/advocacy/promomaterial/DFD/open_formats_poster_A3_EN_v2.pdf" title="Open Formats Poster">English</a>, 
+		<a href="http://download.fsfe.org/advocacy/promomaterial/DFD/open_formats_poster_A3_FR_v2.pdf" title="Open Formats Poster">French</a>, 
+		<a href="http://download.fsfe.org/advocacy/promomaterial/DFD/open_formats_poster_A3_DE_v2.pdf" title="Open Formats Poster">German</a>, 
+		<a href="http://download.fsfe.org/advocacy/promomaterial/DFD/open_formats_poster_A3_EN_FR_v2.pdf" title="Open Formats Poster">English &amp; Frech (two sided)</a>
     </languages>
     <printed>
       Two sided poster in English and French. 

contribute/promoitems/info-nocloud-sticker-bw.en.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <infoset>
   <info id="nocloud-sticker-bw">
-    <name>"There is no cloud, just other people's computers" - sticker</name>
+    <name>"There is no cloud, just other people's computers" - Sticker</name>
     <description>
       A sticker to let people know about their online-reality that says "There is no cloud just other people's computers"
     </description>