diff --git a/build/makerules.sh b/build/makerules.sh index 7b2bfbaa06..2a6762ad86 100755 --- a/build/makerules.sh +++ b/build/makerules.sh @@ -203,7 +203,7 @@ COPY_SRC_FILES := \$(shell find "\$(INPUTDIR)" -type f \ -not -name '*.xhtml' \ -not -name '*.xml' \ -not -name '*.xsl' \ -) +) \$(INPUTDIR)/order/data/items.en.xml # The same as above, but moved to the output directory COPY_DST_FILES := \$(sort \$(patsubst \$(INPUTDIR)/%,\$(OUTPUTDIR)/%,\$(COPY_SRC_FILES))) diff --git a/cgi-bin/weborder.pl b/cgi-bin/weborder.pl index 624c8b0256..3edc7029fe 100755 --- a/cgi-bin/weborder.pl +++ b/cgi-bin/weborder.pl @@ -25,10 +25,12 @@ use POSIX qw(strftime); use Digest::SHA qw(sha1_hex); use MIME::Lite; use MIME::Base64; +use XML::LibXML; use utf8; use LWP::UserAgent; use HTTP::Request::Common qw(POST); use JSON; +use strict; use warnings; use diagnostics; @@ -90,13 +92,18 @@ if ( !$email ) { exit; } +my $items_file = $ENV{"DOCUMENT_ROOT"} . "order/data/items.en.xml"; +my $items = XML::LibXML->load_xml(location => $items_file); + my $count = 0; my $amount = 0; -foreach $item ( $query->param ) { - $value = $query->param($item); +foreach my $item ( $query->param ) { + my $value = $query->param($item); if ( not $item =~ /^_/ and $value ) { - my $price = $query->param("_$item"); + # Remove size from item info so price is found properly + $item =~ s/_.*//; + my $price = $items->findvalue("/itemset/item[\@id=\"$item\"]/\@price"); $count += 1; $amount += $value * $price; } @@ -197,10 +204,12 @@ my $body = <<"HTML"; 
 HTML
 
-foreach $item ( $query->param ) {
-    $value = $query->param($item);
+foreach my $item ( $query->param ) {
+    my $value = $query->param($item);
     if ( not $item =~ /^_/ and $value ) {
-        my $price    = $query->param("_$item");
+        # Remove size from item info so price is found properly
+        $item =~ s/_.*//;
+        my $price = $items->findvalue("/itemset/item[\@id=\"$item\"]/\@price");
         my $subtotal = $value * $price;
         $body .= <<"HTML";
 $value x $item: € $subtotal
@@ -240,10 +249,12 @@ push @odtfill, "Name=" . $name;
 push @odtfill, "Address=" . $address =~ s/\n/\\n/gr;
 push @odtfill, "ZipCity=" . $zip . " " . $city;
 push @odtfill, "Country=" . $country_name;
-foreach $item ( $query->param ) {
-    $value = $query->param($item);
+foreach my $item ( $query->param ) {
+    my $value = $query->param($item);
     if ( not $item =~ /^_/ and $value ) {
-        my $price = $query->param("_$item");
+        # Remove size from item info so price is found properly
+        $item =~ s/_.*//;
+        my $price = $items->findvalue("/itemset/item[\@id=\"$item\"]/\@price");
         push @odtfill, "Count=" . $value;
         push @odtfill, "Item=" . $item;
         push @odtfill, "Amount=" . sprintf "%.2f", $value * $price;
diff --git a/order/2012/info.de.xml b/order/2012/info.de.xml
deleted file mode 100644
index 984b0bcd1c..0000000000
--- a/order/2012/info.de.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-  1
-
-  
-    Fellowship-Anstecknadel
-    
-      

-        Eine Anstecknadel (15x15mm) mit dem Fellowship-Logo.
-      

-    
-  
-
-  
-    GNU-Anstecknadel
-    
-      

-        Eine Anstecknadel mit dem GNU und rundherum der Schriftzug "Free Software Foundation Europe".
-      

-    
-  
-
diff --git a/order/2012/info.en.xml b/order/2012/info.en.xml
deleted file mode 100644
index d5d21cab75..0000000000
--- a/order/2012/info.en.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-  1
-
-  
-    Fellowship pin
-    
-      

-        A pin (15x15mm) with the Fellowship logo.
-      

-    
-  
-
-  
-    Gnu pin
-    
-      

-        A pin with the Gnu. The text around: "Free Software Foundation Europe"
-      

-    
-  
-
diff --git a/order/2012/info.nl.xml b/order/2012/info.nl.xml
deleted file mode 100644
index 5c6c30b2a8..0000000000
--- a/order/2012/info.nl.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-  1
-
-  
-    Fellowship speld
-    
-      

-        Een pin (15x15mm) met het Fellowship-logo.
-      

-    
-  
-
-  
-    Gnu speld
-    
-      

-        Een speld met Gnu en de tekst  "Free Software Foundation Europe".
-      

-    
-  
-
diff --git a/order/2012/item.en.xml b/order/2012/item.en.xml
deleted file mode 100644
index bca3f3939f..0000000000
--- a/order/2012/item.en.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-  1
-
-
-
-
-
diff --git a/order/2016/info.de.xml b/order/2016/info.de.xml
deleted file mode 100644
index c093f1057a..0000000000
--- a/order/2016/info.de.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-  1
-
-  
-    There is NO CLOUD, schwarz
-    
-      

-        Ein Muss für jeden, der andere daran erinnern möchte, wie wichtig es
-        ist, die Kontrolle über die eigenen Daten zu behalten.
-      

-      

-        Achtung: Die Größen sind kleiner als üblich. Beachten
-        Sie bitte die Größentabelle.
-      

-    
-  
-
diff --git a/order/2016/info.en.xml b/order/2016/info.en.xml
deleted file mode 100644
index c73e0d02f7..0000000000
--- a/order/2016/info.en.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-  1
-
-  
-    There is NO CLOUD, black
-    
-      

-        A must have for everybody who wants to remind others how important it is
-        to keep in control of one's own data.
-      

-      

-        Note: Sizes are smaller than usual. Please have a look
-        at the size chart.
-      

-    
-  
-
diff --git a/order/2016/info.nl.xml b/order/2016/info.nl.xml
deleted file mode 100644
index 9c03e9b979..0000000000
--- a/order/2016/info.nl.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-  1
-
-  
-    There is NO CLOUD, zwart
-    
-      

-        Iedereen die anderen eraan wil herinneren hoe belangrijk het is om  
-contole te hebben over de eigen data, kan niet zonder.
-      

-    
-  
-
diff --git a/order/2016/info.sq.xml b/order/2016/info.sq.xml
deleted file mode 100644
index 979ceedafa..0000000000
--- a/order/2016/info.sq.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-  1
-
-  
-    There is NO CLOUD, e zezë
-    
-      

-        E domosdoshme për këdo që dëshiron t’u kujtojë të tjerëve se sa e rëndësishme është
-        të ruhet kontrolli i të dhënave të veta.
-      

-    
-  
-
diff --git a/order/2016/item.en.xml b/order/2016/item.en.xml
deleted file mode 100644
index 0cb1fa5664..0000000000
--- a/order/2016/item.en.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-  1
-
-  
-
diff --git a/order/2017/info.de.xml b/order/2017/info.de.xml
deleted file mode 100644
index 027a077453..0000000000
--- a/order/2017/info.de.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-  1
-
-  
-    Lätzchen mit aufgesticktem Text „I am a fork()“, pink
-    
-      

-        Das ideale Geschenk für unsere Nachwuchs-Hacker und deren Eltern.
-      

-    
-  
-
-  
-    T-Shirt „100 Freedoms“, schwarz
-    
-      

-        Mit diesem T-Shirt lässt sich zeigen, dass Freie Software geradezu überraschend viel Freiheit gewährt.
-      

-    
-  
-
diff --git a/order/2017/info.en.xml b/order/2017/info.en.xml
deleted file mode 100644
index f10b6b4a97..0000000000
--- a/order/2017/info.en.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-  1
-
-  
-    Baby bib with stitched text “I am a fork()”, pink
-    
-      

-        The ideal present for our youngest hackers and their parents.
-      

-    
-  
-
-  
-    T-shirt “100 Freedoms”, black
-    
-      

-        With this T-shirt, you can show that Free Software offers an unexpected amount of freedom.
-      

-    
-  
-
diff --git a/order/2017/info.it.xml b/order/2017/info.it.xml
deleted file mode 100644
index 6e3e5a4c0f..0000000000
--- a/order/2017/info.it.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-  1
-
-  
-    Bavaglino per neonato con scritta cucita “I am a fork()”, rosa
-    
-      

-        Il regalo perfetto per il piccolo hacker ed i suoi genitori.
-      

-    
-  
-
-  
-    Maglietta “100 Freedoms”, nera
-    
-      

-        Con questa maglietta potrai far sapere alla gente che il Software Libero garantisce delle libertà inaspettate.
-      

-    
-  
-
diff --git a/order/2017/info.nl.xml b/order/2017/info.nl.xml
deleted file mode 100644
index ca38ab3e27..0000000000
--- a/order/2017/info.nl.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-  1
-  
-    Babyslabbetje met geborduurde tekst “I am a fork()”, roze
-    
-      

-        Het ideale geschenk voor onze jongste hackers en hun ouders.
-      

-    
-  
-  
-    T-shirt “100 Freedoms”, zwart
-    
-      

-        Met dit T-shirt kunt u laten zien dat Vrije Software een onverwachte hoeveelheid vrijheid biedt.
-      

-    
-  
-
-
diff --git a/order/2017/item.en.xml b/order/2017/item.en.xml
deleted file mode 100644
index d4da575003..0000000000
--- a/order/2017/item.en.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-  1
-
-  
-
diff --git a/order/2018/info.de.xml b/order/2018/info.de.xml
deleted file mode 100644
index 7fd8337bbd..0000000000
--- a/order/2018/info.de.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-  1
-
-  
-    „Public Money, Public Code“ Tasche, beige
-    
-      

-        Mit dieser Tasche kann man nicht nur seine Einkäufe, sondern auch eine
-        wichtige Botschaft transportieren.
-      

-    
-  
-
-  
-    There is NO CLOUD Kühlschrankmagnet, schwarz mit weißer Schrift
-    
-      

-        Der beliebteste Slogan der FSFE, jetzt auch als 74x74x2 mm Kühlschrankmagnet!
-      

-    
-  
-
-  
-    There is NO CLOUD Kühlschrankmagnet, schwarz mit blauer Schrift
-    
-      

-        Der beliebteste Slogan der FSFE, jetzt auch als 74x74x2 mm Kühlschrankmagnet!
-      

-    
-  
-
-  
-    Public Money Public Code Kühlschrankmagnet, Logo und Text
-    
-      

-        Public Money? Public Code! Ein 55x75x2 mm Kühlschrankmagnet mit dem Logo und dem Slogan der Kampagne.
-      

-    
-  
-
-  
-    Public Money Public Code Kühlschrankmagnet, nur Text
-    
-      

-        Public Money? Public Code! Ein 105x52x2 mm Kühlschrankmagnet mit dem Slogan der Kampagne.
-      

-    
-  
-
diff --git a/order/2018/info.en.xml b/order/2018/info.en.xml
deleted file mode 100644
index e7746770f9..0000000000
--- a/order/2018/info.en.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-  1
-
-  
-    “Public Money, Public Code” bag, natural
-    
-      

-        With this bag, you can at the same time carry goods and an
-        important message.
-      

-    
-  
-
-  
-    There is NO CLOUD fridge magnet, black and white
-    
-      

-        FSFE's most popular slogan, now also on a 74x74x2 mm fridge magnet!
-      

-    
-  
-
-  
-    There is NO CLOUD fridge magnet, black and blue
-    
-      

-        FSFE's most popular slogan, now also on a 74x74x2 mm fridge magnet!
-      

-    
-  
-
-  
-    Public Money Public Code fridge magnet, logo and text
-    
-      

-        Public Money? Public Code! A 55x75x2 mm fridge magnet with the campaign logo and slogan.
-      

-    
-  
-
-  
-    Public Money Public Code fridge magnet, text only
-    
-      

-        Public Money? Public Code! A 105x52x2 mm fridge magnet with the campaign slogan.
-      

-    
-  
-
diff --git a/order/2018/info.it.xml b/order/2018/info.it.xml
deleted file mode 100644
index b1538bac0d..0000000000
--- a/order/2018/info.it.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-  1
-
-  
-    Borsa “Public Money, Public Code”, colore neutro
-    
-      

-        Questa borsa è molto pratica, ti permette di trasportare due cose assieme: la spesa e un
-        messaggio molto importante per chi passa vicino a te.
-      

-    
-  
-
-  
-    Calamita "There is NO CLOUD", bianca e nera
-    
-      

-        Il motto più famoso della FSFE, su una calamita 74x74x2 mm.
-      

-    
-  
-
-  
-    Calamita "There is NO CLOUD", blu e nera
-    
-      

-        Il motto più famoso della FSFE, su una calamita 74x74x2 mm.
-      

-    
-  
-
-  
-    Calamita "Public Money Public Code", logo e testo
-    
-      

-        Public Money? Public Code! Una calamita 55x75x2 mm con lo slogan ed il logo della campagna.
-      

-    
-  
-
-  
-    Calamita "Public Money Public Code", solo testo
-    
-      

-        Public Money? Public Code! Una calamita 105x52x2 mm con lo slogan della campagna.
-      

-    
-  
-
diff --git a/order/2018/info.nl.xml b/order/2018/info.nl.xml
deleted file mode 100644
index 233ebc0fe6..0000000000
--- a/order/2018/info.nl.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-  1
-  
-    “Public Money, Public Code”-tas, naturel
-    
-      

-        Met deze tas kunt u tegelijk goederen vervoeren en een belangrijke boodschap verspreiden.
-      

-    
-  
-  
-    There is NO CLOUD koelkastmagneet, zwart en wit
-    
-      

-        FSFE's populairste leus, nu ook op een 74x74x2 mm koelkastmagneet!
-      

-    
-  
-  
-    There is NO CLOUD koelkastmagneet, zwart en blauw
-    
-      

-        FSFE's populairste leus, nu ook op een 74x74x2 mm koelkastmagneet!
-      

-    
-  
-  
-    Public Money Public Code koelkastmagneet, logo en tekst
-    
-      

-        Public Money? Public Code! Een 55x75x2 mm koelkastmagneet met het logo en de leus van de campagne.
-      

-    
-  
-  
-    Public Money Public Code koelkastmagneet, alleen tekst
-    
-      

-        Public Money? Public Code! Een 105x52x2 mm koelkastmagneet met de leus van de campagne.
-      

-    
-  
-
-
diff --git a/order/2018/item.en.xml b/order/2018/item.en.xml
deleted file mode 100644
index c4e945a1b0..0000000000
--- a/order/2018/item.en.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-  1
-
-  
-    
-    
-  
-
-  
-    
-    
-  
-
-  
-    
-    
-  
-
diff --git a/order/2019/info.de.xml b/order/2019/info.de.xml
deleted file mode 100644
index 05f137dc01..0000000000
--- a/order/2019/info.de.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-  1
-
-  
-    FSFE-Logo-Anstecknadel
-    
-      

-        Eine Anstecknadel (10x18mm) mit dem Logo der FSFE.
-      

-    
-  
-
-  
-    FSFE-Logo-Ansteckmagnet
-    
-      

-        Ein Ansteckmagnet (10x18mm) mit dem Logo der FSFE – macht keine Löcher in die Kleidung.
-      

-    
-  
-
-  
-    Mehrsprachiges T-Shirt, schwarz
-    
-      

-        Zeigen Sie Ihre Liebe für Freie Software in 24 Sprachen!
-      

-    
-  
-
-  
-    Mehrsprachiges T-Shirt, schwarz
-    
-      

-        Zeigen Sie Ihre Liebe für Freie Software in 24 Sprachen!
-      

-    
-  
-
-  
-    Mehrsprachiges T-Shirt, blau
-    
-      

-        Zeigen Sie Ihre Liebe für Freie Software in 24 Sprachen!
-      

-    
-  
-
-  
-    Lätzchen mit aufgesticktem Text „I am a fork()“, schwarz
-    
-      

-        Das ideale Geschenk für unsere Nachwuchs-Hacker und deren Eltern.
-      

-    
-  
-
-  
-    Weihnachtskarten, Paket zu 10 Stück, mit 10 Briefumschlägen
-    
-      

-        Unterstützen Sie die FSFE, indem Sie diese Weihnachts-Grußkarten
-        kaufen! Größe A6, aufklappbar, mit einer weihnachtlichen Grafik
-        auf der Vorderseite und einem kleinen FSFE-Logo auf der
-        Rückseite.
-      

-    
-  
-
diff --git a/order/2019/info.en.xml b/order/2019/info.en.xml
deleted file mode 100644
index d9b8793f4b..0000000000
--- a/order/2019/info.en.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-  1
-
-  
-    FSFE logo pin
-    
-      

-        A pin (10x18mm) with the FSFE logo.
-      

-    
-  
-
-  
-    FSFE logo magnet pin
-    
-      

-        A magnetic pin (10x18mm) (will not make a hole in your clothes!) with the FSFE logo.
-      

-    
-  
-
-  
-    Multilingual T-shirt, black
-    
-      

-        Show your love for Free Software in 24 languages!
-      

-    
-  
-
-  
-    Multilingual T-shirt, black
-    
-      

-        Show your love for Free Software in 24 languages!
-      

-    
-  
-
-  
-    Multilingual T-shirt, blue
-    
-      

-        Show your love for Free Software in 24 languages!
-      

-    
-  
-
-  
-    Baby bib with stitched text “I am a fork()”, black
-    
-      

-        The ideal present for our youngest hackers and their parents.
-      

-    
-  
-
-  
-    Christmas cards, package of 10, with 10 envelopes
-    
-      

-        Support FSFE by buying these christmas greeting cards! A6 sized,
-        folded, with a Christmassy graphic on the front and a small FSFE
-        logo on the back.
-      

-    
-  
-
diff --git a/order/2019/info.nl.xml b/order/2019/info.nl.xml
deleted file mode 100644
index 4599ca3a44..0000000000
--- a/order/2019/info.nl.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-  1
-  
-    FSFE-logo speld
-    
-      

-        Een speld (10x18mm) met het FSFE-logo.
-      

-    
-  
-  
-    FSFE-logo magneetspeld
-    
-      

-        Een magneetspeld (10x18mm) (zal geen gat in uw kleding maken!) met het FSFE-logo.
-      

-    
-  
-  
-    Meertalig T-shirt, zwart
-    
-      

-        Laat uw liefde voor Vrije Software in 24 talen zien!
-      

-    
-  
-  
-    Meertalig T-shirt, zwart
-    
-      

-        Laat uw liefde voor Vrije Software in 24 talen zien!
-      

-    
-  
-  
-    Meertalig T-shirt, blauw
-    
-      

-        Laat uw liefde voor Vrije Software in 24 talen zien!
-      

-    
-  
-  
-    Babyslabbetje met geborduurde tekst “I am a fork()”, zwart
-    
-      

-        Het ideale geschenk voor de jongste hackers en hun ouders.
-      

-    
-  
-  
-    Kerstkaarten, pak van 10 stuks met 10 enveloppen
-    
-      

-        Steun de FSFE door deze kerstkaarten te kopen! A6-formaat,
-        gevouwen, met een kerstafbeelding op de voorkant en een klein FSFE-logo op de achterkant.
-      

-    
-  
-
-
diff --git a/order/2019/item.en.xml b/order/2019/item.en.xml
deleted file mode 100644
index 314da8002e..0000000000
--- a/order/2019/item.en.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-
-
-  1
-
-  
-
-  
-    
-    
-  
-
-  
-    
-    
-    
-  
-
-  
-    
-    
-    
-    
-  
-
-  
-    
-    
-    
-    
-    
-  
-
-  
-    
-    
-  
-
-  
-
diff --git a/order/2021/info.de.xml b/order/2021/info.de.xml
deleted file mode 100644
index 9fb26b8e30..0000000000
--- a/order/2021/info.de.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-  1
-
-  
-    Stofftasche „Since 2001“ / „There is NO CLOUD“, blau
-    
-      

-        Die Tasche zum 20. Geburtstag der FSFE.
-      

-    
-  
-
diff --git a/order/2021/info.en.xml b/order/2021/info.en.xml
deleted file mode 100644
index 7e26500f9b..0000000000
--- a/order/2021/info.en.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-  1
-
-  
-    Bag „Since 2001“ / „There is NO CLOUD“, blue
-    
-      

-        This bag was issued for FSFE's 20th birthday.
-      

-    
-  
-
diff --git a/order/2021/info.nl.xml b/order/2021/info.nl.xml
deleted file mode 100644
index 078ce6512c..0000000000
--- a/order/2021/info.nl.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-  1
-  
-    Tas „Since 2001“ / „There is NO CLOUD“, blauw
-    
-      

-Deze tas is vervaardigd voor de 20ste verjaardag van de FSFE.
-      

-    
-  
-
-
diff --git a/order/2021/item.en.xml b/order/2021/item.en.xml
deleted file mode 100644
index d9f37c31b6..0000000000
--- a/order/2021/item.en.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-  1
-
-  
-    
-    
-    
-  
-
diff --git a/order/2024/info.en.xml b/order/2024/info.en.xml
deleted file mode 100644
index 5748e2dd96..0000000000
--- a/order/2024/info.en.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-  1
-
-  
-    There is NO CLOUD T-shirt, petrol green
-    
-      

-       An evergreen, but this time in petrol green
-      

-    
-  
-  
-    
-    Hacking for Freedom T-shirt, black
-    
-      

-       Old slogan, new tshirt
-      

-    
-  
-
-
-    I love Free Software socks, red
-    
-      

-       The 4 freedoms at your feet... because you really love Free software
-      

-      

-        Note: One size. Fits from 38 to 45.
-      

-    
-  
-
diff --git a/order/2024/item.en.xml b/order/2024/item.en.xml
deleted file mode 100644
index 84d70f55fe..0000000000
--- a/order/2024/item.en.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-  1
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-
-  
-    
-    
-    
-    
-    
-    
-    
-    
-  
- 
- 
-  
-    
-    
-  
-  
-
diff --git a/order/data/info/baby-bib-black.de.xml b/order/data/info/baby-bib-black.de.xml
new file mode 100644
index 0000000000..b3d6aebb4b
--- /dev/null
+++ b/order/data/info/baby-bib-black.de.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Lätzchen mit aufgesticktem Text „I am a fork()“, schwarz
+    
+      
Das ideale Geschenk für unsere Nachwuchs-Hacker und deren Eltern.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/baby-bib-black.en.xml b/order/data/info/baby-bib-black.en.xml
new file mode 100644
index 0000000000..9d059eb673
--- /dev/null
+++ b/order/data/info/baby-bib-black.en.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Baby bib with stitched text “I am a fork()”, black
+    
+      
The ideal present for our youngest hackers and their parents.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/baby-bib-black.nl.xml b/order/data/info/baby-bib-black.nl.xml
new file mode 100644
index 0000000000..9c9789f16c
--- /dev/null
+++ b/order/data/info/baby-bib-black.nl.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Babyslabbetje met geborduurde tekst “I am a fork()”, zwart
+    
+      
Het ideale geschenk voor de jongste hackers en hun ouders.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/baby-bib-pink.de.xml b/order/data/info/baby-bib-pink.de.xml
new file mode 100644
index 0000000000..5341fc7f88
--- /dev/null
+++ b/order/data/info/baby-bib-pink.de.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Lätzchen mit aufgesticktem Text „I am a fork()“, pink
+    
+      
Das ideale Geschenk für unsere Nachwuchs-Hacker und deren Eltern.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/baby-bib-pink.en.xml b/order/data/info/baby-bib-pink.en.xml
new file mode 100644
index 0000000000..ab4ba65d3a
--- /dev/null
+++ b/order/data/info/baby-bib-pink.en.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Baby bib with stitched text “I am a fork()”, pink
+    
+      
The ideal present for our youngest hackers and their parents.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/baby-bib-pink.it.xml b/order/data/info/baby-bib-pink.it.xml
new file mode 100644
index 0000000000..1249cdbd6f
--- /dev/null
+++ b/order/data/info/baby-bib-pink.it.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Bavaglino per neonato con scritta cucita “I am a fork()”, rosa
+    
+      
Il regalo perfetto per il piccolo hacker ed i suoi genitori.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/baby-bib-pink.nl.xml b/order/data/info/baby-bib-pink.nl.xml
new file mode 100644
index 0000000000..12105f3c8c
--- /dev/null
+++ b/order/data/info/baby-bib-pink.nl.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Babyslabbetje met geborduurde tekst “I am a fork()”, roze
+    
+      
Het ideale geschenk voor onze jongste hackers en hun ouders.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/bag-pmpc-natural.de.xml b/order/data/info/bag-pmpc-natural.de.xml
new file mode 100644
index 0000000000..0a52e341dc
--- /dev/null
+++ b/order/data/info/bag-pmpc-natural.de.xml
@@ -0,0 +1,11 @@
+
+
+1
+  
+    „Public Money, Public Code“ Tasche, beige
+    
+      
Mit dieser Tasche kann man nicht nur seine Einkäufe, sondern auch eine
+        wichtige Botschaft transportieren.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/bag-pmpc-natural.en.xml b/order/data/info/bag-pmpc-natural.en.xml
new file mode 100644
index 0000000000..bfc1e926e1
--- /dev/null
+++ b/order/data/info/bag-pmpc-natural.en.xml
@@ -0,0 +1,11 @@
+
+
+1
+  
+    “Public Money, Public Code” bag, natural
+    
+      
With this bag, you can at the same time carry goodsandan
+        important message.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/bag-pmpc-natural.it.xml b/order/data/info/bag-pmpc-natural.it.xml
new file mode 100644
index 0000000000..bd3b1ae8c4
--- /dev/null
+++ b/order/data/info/bag-pmpc-natural.it.xml
@@ -0,0 +1,11 @@
+
+
+1
+  
+    Borsa “Public Money, Public Code”, colore neutro
+    
+      
Questa borsa è molto pratica, ti permette di trasportare due cose assieme: la spesaeun
+        messaggio molto importante per chi passa vicino a te.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/bag-pmpc-natural.nl.xml b/order/data/info/bag-pmpc-natural.nl.xml
new file mode 100644
index 0000000000..a6b4f356e1
--- /dev/null
+++ b/order/data/info/bag-pmpc-natural.nl.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    “Public Money, Public Code”-tas, naturel
+    
+      
Met deze tas kunt u tegelijk goederen vervoereneneen belangrijke boodschap verspreiden.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/bag-since2001-blue.de.xml b/order/data/info/bag-since2001-blue.de.xml
new file mode 100644
index 0000000000..4f40d0680b
--- /dev/null
+++ b/order/data/info/bag-since2001-blue.de.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Stofftasche „Since 2001“ / „There is NO CLOUD“, blau
+    
+      
Die Tasche zum 20. Geburtstag der FSFE.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/bag-since2001-blue.en.xml b/order/data/info/bag-since2001-blue.en.xml
new file mode 100644
index 0000000000..761660d4ae
--- /dev/null
+++ b/order/data/info/bag-since2001-blue.en.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Bag „Since 2001“ / „There is NO CLOUD“, blue
+    
+      
This bag was issued for FSFE's 20th birthday.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/bag-since2001-blue.nl.xml b/order/data/info/bag-since2001-blue.nl.xml
new file mode 100644
index 0000000000..30d8b57252
--- /dev/null
+++ b/order/data/info/bag-since2001-blue.nl.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Tas „Since 2001“ / „There is NO CLOUD“, blauw
+    
+      
Deze tas is vervaardigd voor de 20ste verjaardag van de FSFE.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/card-christmas-blue.de.xml b/order/data/info/card-christmas-blue.de.xml
new file mode 100644
index 0000000000..7bc15fabd5
--- /dev/null
+++ b/order/data/info/card-christmas-blue.de.xml
@@ -0,0 +1,13 @@
+
+
+1
+  
+    Weihnachtskarten, Paket zu 10 Stück, mit 10 Briefumschlägen
+    
+      
Unterstützen Sie die FSFE, indem Sie diese Weihnachts-Grußkarten
+        kaufen! Größe A6, aufklappbar, mit einer weihnachtlichen Grafik
+        auf der Vorderseite und einem kleinen FSFE-Logo auf der
+        Rückseite.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/card-christmas-blue.en.xml b/order/data/info/card-christmas-blue.en.xml
new file mode 100644
index 0000000000..35a35c0622
--- /dev/null
+++ b/order/data/info/card-christmas-blue.en.xml
@@ -0,0 +1,12 @@
+
+
+1
+  
+    Christmas cards, package of 10, with 10 envelopes
+    
+      
Support FSFE by buying these christmas greeting cards! A6 sized,
+        folded, with a Christmassy graphic on the front and a small FSFE
+        logo on the back.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/card-christmas-blue.nl.xml b/order/data/info/card-christmas-blue.nl.xml
new file mode 100644
index 0000000000..cf1a169fd7
--- /dev/null
+++ b/order/data/info/card-christmas-blue.nl.xml
@@ -0,0 +1,11 @@
+
+
+1
+  
+    Kerstkaarten, pak van 10 stuks met 10 enveloppen
+    
+      
Steun de FSFE door deze kerstkaarten te kopen! A6-formaat,
+        gevouwen, met een kerstafbeelding op de voorkant en een klein FSFE-logo op de achterkant.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/girlie-multilingual-black.de.xml b/order/data/info/girlie-multilingual-black.de.xml
new file mode 100644
index 0000000000..7508be3eb5
--- /dev/null
+++ b/order/data/info/girlie-multilingual-black.de.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Mehrsprachiges T-Shirt, schwarz
+    
+      
Zeigen Sie Ihre Liebe für Freie Software in 24 Sprachen!

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/girlie-multilingual-black.en.xml b/order/data/info/girlie-multilingual-black.en.xml
new file mode 100644
index 0000000000..525d27fd0a
--- /dev/null
+++ b/order/data/info/girlie-multilingual-black.en.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Multilingual T-shirt, black
+    
+      
Show your love for Free Software in 24 languages!

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/girlie-multilingual-black.nl.xml b/order/data/info/girlie-multilingual-black.nl.xml
new file mode 100644
index 0000000000..ca1028c225
--- /dev/null
+++ b/order/data/info/girlie-multilingual-black.nl.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Meertalig T-shirt, zwart
+    
+      
Laat uw liefde voor Vrije Software in 24 talen zien!

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/girlie-multilingual-blue.de.xml b/order/data/info/girlie-multilingual-blue.de.xml
new file mode 100644
index 0000000000..f9df30249b
--- /dev/null
+++ b/order/data/info/girlie-multilingual-blue.de.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Mehrsprachiges T-Shirt, blau
+    
+      
Zeigen Sie Ihre Liebe für Freie Software in 24 Sprachen!

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/girlie-multilingual-blue.en.xml b/order/data/info/girlie-multilingual-blue.en.xml
new file mode 100644
index 0000000000..96cb4a94de
--- /dev/null
+++ b/order/data/info/girlie-multilingual-blue.en.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Multilingual T-shirt, blue
+    
+      
Show your love for Free Software in 24 languages!

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/girlie-multilingual-blue.nl.xml b/order/data/info/girlie-multilingual-blue.nl.xml
new file mode 100644
index 0000000000..1a111e4533
--- /dev/null
+++ b/order/data/info/girlie-multilingual-blue.nl.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Meertalig T-shirt, blauw
+    
+      
Laat uw liefde voor Vrije Software in 24 talen zien!

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/magnet-nocloud-blue.de.xml b/order/data/info/magnet-nocloud-blue.de.xml
new file mode 100644
index 0000000000..5f6385e404
--- /dev/null
+++ b/order/data/info/magnet-nocloud-blue.de.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    There is NO CLOUD Kühlschrankmagnet, schwarz mit blauer Schrift
+    
+      
Der beliebteste Slogan der FSFE, jetzt auch als 74x74x2 mm Kühlschrankmagnet!

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/magnet-nocloud-blue.en.xml b/order/data/info/magnet-nocloud-blue.en.xml
new file mode 100644
index 0000000000..f529a87f61
--- /dev/null
+++ b/order/data/info/magnet-nocloud-blue.en.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    There is NO CLOUD fridge magnet, black and blue
+    
+      
FSFE's most popular slogan, now also on a 74x74x2 mm fridge magnet!

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/magnet-nocloud-blue.it.xml b/order/data/info/magnet-nocloud-blue.it.xml
new file mode 100644
index 0000000000..1f9774e687
--- /dev/null
+++ b/order/data/info/magnet-nocloud-blue.it.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Calamita "There is NO CLOUD", blu e nera
+    
+      
Il motto più famoso della FSFE, su una calamita 74x74x2 mm.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/magnet-nocloud-blue.nl.xml b/order/data/info/magnet-nocloud-blue.nl.xml
new file mode 100644
index 0000000000..e265d91c83
--- /dev/null
+++ b/order/data/info/magnet-nocloud-blue.nl.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    There is NO CLOUD koelkastmagneet, zwart en blauw
+    
+      
FSFE's populairste leus, nu ook op een 74x74x2 mm koelkastmagneet!

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/magnet-nocloud-white.de.xml b/order/data/info/magnet-nocloud-white.de.xml
new file mode 100644
index 0000000000..4209e5b3aa
--- /dev/null
+++ b/order/data/info/magnet-nocloud-white.de.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    There is NO CLOUD Kühlschrankmagnet, schwarz mit weißer Schrift
+    
+      
Der beliebteste Slogan der FSFE, jetzt auch als 74x74x2 mm Kühlschrankmagnet!

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/magnet-nocloud-white.en.xml b/order/data/info/magnet-nocloud-white.en.xml
new file mode 100644
index 0000000000..a857001262
--- /dev/null
+++ b/order/data/info/magnet-nocloud-white.en.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    There is NO CLOUD fridge magnet, black and white
+    
+      
FSFE's most popular slogan, now also on a 74x74x2 mm fridge magnet!

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/magnet-nocloud-white.it.xml b/order/data/info/magnet-nocloud-white.it.xml
new file mode 100644
index 0000000000..d6cc8c4787
--- /dev/null
+++ b/order/data/info/magnet-nocloud-white.it.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Calamita "There is NO CLOUD", bianca e nera
+    
+      
Il motto più famoso della FSFE, su una calamita 74x74x2 mm.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/magnet-nocloud-white.nl.xml b/order/data/info/magnet-nocloud-white.nl.xml
new file mode 100644
index 0000000000..c0948f3343
--- /dev/null
+++ b/order/data/info/magnet-nocloud-white.nl.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    There is NO CLOUD koelkastmagneet, zwart en wit
+    
+      
FSFE's populairste leus, nu ook op een 74x74x2 mm koelkastmagneet!

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/magnet-pmpc-black.de.xml b/order/data/info/magnet-pmpc-black.de.xml
new file mode 100644
index 0000000000..3739b95366
--- /dev/null
+++ b/order/data/info/magnet-pmpc-black.de.xml
@@ -0,0 +1,11 @@
+
+
+1
+  
+    Public Money Public Code Kühlschrankmagnet, nur Text
+    
+      

+        Public Money? Public Code!Ein 105x52x2 mm Kühlschrankmagnet mit dem Slogan der Kampagne.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/magnet-pmpc-black.en.xml b/order/data/info/magnet-pmpc-black.en.xml
new file mode 100644
index 0000000000..5e7fc96e7e
--- /dev/null
+++ b/order/data/info/magnet-pmpc-black.en.xml
@@ -0,0 +1,11 @@
+
+
+1
+  
+    Public Money Public Code fridge magnet, text only
+    
+      

+        Public Money? Public Code!A 105x52x2 mm fridge magnet with the campaign slogan.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/magnet-pmpc-black.it.xml b/order/data/info/magnet-pmpc-black.it.xml
new file mode 100644
index 0000000000..07c7b720bb
--- /dev/null
+++ b/order/data/info/magnet-pmpc-black.it.xml
@@ -0,0 +1,11 @@
+
+
+1
+  
+    Calamita "Public Money Public Code", solo testo
+    
+      

+        Public Money? Public Code!Una calamita 105x52x2 mm con lo slogan della campagna.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/magnet-pmpc-black.nl.xml b/order/data/info/magnet-pmpc-black.nl.xml
new file mode 100644
index 0000000000..22d4dda323
--- /dev/null
+++ b/order/data/info/magnet-pmpc-black.nl.xml
@@ -0,0 +1,11 @@
+
+
+1
+  
+    Public Money Public Code koelkastmagneet, alleen tekst
+    
+      

+        Public Money? Public Code!Een 105x52x2 mm koelkastmagneet met de leus van de campagne.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/magnet-pmpc-white.de.xml b/order/data/info/magnet-pmpc-white.de.xml
new file mode 100644
index 0000000000..87be53c189
--- /dev/null
+++ b/order/data/info/magnet-pmpc-white.de.xml
@@ -0,0 +1,11 @@
+
+
+1
+  
+    Public Money Public Code Kühlschrankmagnet, Logo und Text
+    
+      

+        Public Money? Public Code!Ein 55x75x2 mm Kühlschrankmagnet mit dem Logo und dem Slogan der Kampagne.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/magnet-pmpc-white.en.xml b/order/data/info/magnet-pmpc-white.en.xml
new file mode 100644
index 0000000000..fa9970e850
--- /dev/null
+++ b/order/data/info/magnet-pmpc-white.en.xml
@@ -0,0 +1,11 @@
+
+
+1
+  
+    Public Money Public Code fridge magnet, logo and text
+    
+      

+        Public Money? Public Code!A 55x75x2 mm fridge magnet with the campaign logo and slogan.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/magnet-pmpc-white.it.xml b/order/data/info/magnet-pmpc-white.it.xml
new file mode 100644
index 0000000000..07e58a6bbf
--- /dev/null
+++ b/order/data/info/magnet-pmpc-white.it.xml
@@ -0,0 +1,11 @@
+
+
+1
+  
+    Calamita "Public Money Public Code", logo e testo
+    
+      

+        Public Money? Public Code!Una calamita 55x75x2 mm con lo slogan ed il logo della campagna.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/magnet-pmpc-white.nl.xml b/order/data/info/magnet-pmpc-white.nl.xml
new file mode 100644
index 0000000000..23270be5b8
--- /dev/null
+++ b/order/data/info/magnet-pmpc-white.nl.xml
@@ -0,0 +1,11 @@
+
+
+1
+  
+    Public Money Public Code koelkastmagneet, logo en tekst
+    
+      

+        Public Money? Public Code!Een 55x75x2 mm koelkastmagneet met het logo en de leus van de campagne.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/magnetpin-fsfe-white.de.xml b/order/data/info/magnetpin-fsfe-white.de.xml
new file mode 100644
index 0000000000..6d03e2d83f
--- /dev/null
+++ b/order/data/info/magnetpin-fsfe-white.de.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    FSFE-Logo-Ansteckmagnet
+    
+      
Ein Ansteckmagnet (10x18mm) mit dem Logo der FSFE – macht keine Löcher in die Kleidung.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/magnetpin-fsfe-white.en.xml b/order/data/info/magnetpin-fsfe-white.en.xml
new file mode 100644
index 0000000000..ad3cdd1b59
--- /dev/null
+++ b/order/data/info/magnetpin-fsfe-white.en.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    FSFE logo magnet pin
+    
+      
A magnetic pin (10x18mm) (will not make a hole in your clothes!) with the FSFE logo.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/magnetpin-fsfe-white.nl.xml b/order/data/info/magnetpin-fsfe-white.nl.xml
new file mode 100644
index 0000000000..066867a806
--- /dev/null
+++ b/order/data/info/magnetpin-fsfe-white.nl.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    FSFE-logo magneetspeld
+    
+      
Een magneetspeld (10x18mm) (zal geen gat in uw kleding maken!) met het FSFE-logo.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/pin-fsfe-white.de.xml b/order/data/info/pin-fsfe-white.de.xml
new file mode 100644
index 0000000000..4738c2ac0e
--- /dev/null
+++ b/order/data/info/pin-fsfe-white.de.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    FSFE-Logo-Anstecknadel
+    
+      
Eine Anstecknadel (10x18mm) mit dem Logo der FSFE.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/pin-fsfe-white.en.xml b/order/data/info/pin-fsfe-white.en.xml
new file mode 100644
index 0000000000..fc6313fd3c
--- /dev/null
+++ b/order/data/info/pin-fsfe-white.en.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    FSFE logo pin
+    
+      
A pin (10x18mm) with the FSFE logo.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/pin-fsfe-white.nl.xml b/order/data/info/pin-fsfe-white.nl.xml
new file mode 100644
index 0000000000..c34234cd8b
--- /dev/null
+++ b/order/data/info/pin-fsfe-white.nl.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    FSFE-logo speld
+    
+      
Een speld (10x18mm) met het FSFE-logo.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/pin-gnu-silver.de.xml b/order/data/info/pin-gnu-silver.de.xml
new file mode 100644
index 0000000000..dc6ac82ea0
--- /dev/null
+++ b/order/data/info/pin-gnu-silver.de.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    GNU-Anstecknadel
+    
+      
Eine Anstecknadel mit dem GNU und rundherum der Schriftzug "Free Software Foundation Europe".

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/pin-gnu-silver.en.xml b/order/data/info/pin-gnu-silver.en.xml
new file mode 100644
index 0000000000..32c7cabeb0
--- /dev/null
+++ b/order/data/info/pin-gnu-silver.en.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Gnu pin
+    
+      
A pin with the Gnu. The text around: "Free Software Foundation Europe"

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/pin-gnu-silver.nl.xml b/order/data/info/pin-gnu-silver.nl.xml
new file mode 100644
index 0000000000..0c607a36b6
--- /dev/null
+++ b/order/data/info/pin-gnu-silver.nl.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Gnu speld
+    
+      
Een speld met Gnu en de tekst  "Free Software Foundation Europe".

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/pin-plussy-green.de.xml b/order/data/info/pin-plussy-green.de.xml
new file mode 100644
index 0000000000..e4747b8bf0
--- /dev/null
+++ b/order/data/info/pin-plussy-green.de.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Fellowship-Anstecknadel
+    
+      
Eine Anstecknadel (15x15mm) mit dem Fellowship-Logo.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/pin-plussy-green.en.xml b/order/data/info/pin-plussy-green.en.xml
new file mode 100644
index 0000000000..5d8c5b0252
--- /dev/null
+++ b/order/data/info/pin-plussy-green.en.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Fellowship pin
+    
+      
A pin (15x15mm) with the Fellowship logo.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/pin-plussy-green.nl.xml b/order/data/info/pin-plussy-green.nl.xml
new file mode 100644
index 0000000000..0bed4abbdd
--- /dev/null
+++ b/order/data/info/pin-plussy-green.nl.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Fellowship speld
+    
+      
Een pin (15x15mm) met het Fellowship-logo.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/socks-ilovefs.en.xml b/order/data/info/socks-ilovefs.en.xml
new file mode 100644
index 0000000000..8db324a080
--- /dev/null
+++ b/order/data/info/socks-ilovefs.en.xml
@@ -0,0 +1,12 @@
+
+
+1
+  
+    I love Free Software socks, red
+    
+      
The 4 freedoms at your feet... because you really love Free software

+      

+        Note:One size. Fits from 38 to 45.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/tshirt-100freedoms-black.de.xml b/order/data/info/tshirt-100freedoms-black.de.xml
new file mode 100644
index 0000000000..2fe660e2b4
--- /dev/null
+++ b/order/data/info/tshirt-100freedoms-black.de.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    T-Shirt „100 Freedoms“, schwarz
+    
+      
Mit diesem T-Shirt lässt sich zeigen, dass Freie Software geradezu überraschend viel Freiheit gewährt.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/tshirt-100freedoms-black.en.xml b/order/data/info/tshirt-100freedoms-black.en.xml
new file mode 100644
index 0000000000..a990f861d3
--- /dev/null
+++ b/order/data/info/tshirt-100freedoms-black.en.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    T-shirt “100 Freedoms”, black
+    
+      
With this T-shirt, you can show that Free Software offers an unexpected amount of freedom.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/tshirt-100freedoms-black.it.xml b/order/data/info/tshirt-100freedoms-black.it.xml
new file mode 100644
index 0000000000..63c7ca676c
--- /dev/null
+++ b/order/data/info/tshirt-100freedoms-black.it.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Maglietta “100 Freedoms”, nera
+    
+      
Con questa maglietta potrai far sapere alla gente che il Software Libero garantisce delle libertà inaspettate.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/tshirt-100freedoms-black.nl.xml b/order/data/info/tshirt-100freedoms-black.nl.xml
new file mode 100644
index 0000000000..e521ee89d3
--- /dev/null
+++ b/order/data/info/tshirt-100freedoms-black.nl.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    T-shirt “100 Freedoms”, zwart
+    
+      
Met dit T-shirt kunt u laten zien dat Vrije Software een onverwachte hoeveelheid vrijheid biedt.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/tshirt-hacking-4-freedom.en.xml b/order/data/info/tshirt-hacking-4-freedom.en.xml
new file mode 100644
index 0000000000..b2343ce4be
--- /dev/null
+++ b/order/data/info/tshirt-hacking-4-freedom.en.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Hacking for Freedom T-shirt, black
+    
+      
Old slogan, new tshirt

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/tshirt-multilingual-black.de.xml b/order/data/info/tshirt-multilingual-black.de.xml
new file mode 100644
index 0000000000..834419a4e9
--- /dev/null
+++ b/order/data/info/tshirt-multilingual-black.de.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Mehrsprachiges T-Shirt, schwarz
+    
+      
Zeigen Sie Ihre Liebe für Freie Software in 24 Sprachen!

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/tshirt-multilingual-black.en.xml b/order/data/info/tshirt-multilingual-black.en.xml
new file mode 100644
index 0000000000..020982f0ed
--- /dev/null
+++ b/order/data/info/tshirt-multilingual-black.en.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Multilingual T-shirt, black
+    
+      
Show your love for Free Software in 24 languages!

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/tshirt-multilingual-black.nl.xml b/order/data/info/tshirt-multilingual-black.nl.xml
new file mode 100644
index 0000000000..e2affa7512
--- /dev/null
+++ b/order/data/info/tshirt-multilingual-black.nl.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    Meertalig T-shirt, zwart
+    
+      
Laat uw liefde voor Vrije Software in 24 talen zien!

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/tshirt-nocloud-black.de.xml b/order/data/info/tshirt-nocloud-black.de.xml
new file mode 100644
index 0000000000..91982af7c8
--- /dev/null
+++ b/order/data/info/tshirt-nocloud-black.de.xml
@@ -0,0 +1,14 @@
+
+
+1
+  
+    There is NO CLOUD, schwarz
+    
+      
Ein Muss für jeden, der andere daran erinnern möchte, wie wichtig es
+        ist, die Kontrolle über die eigenen Daten zu behalten.

+      

+        Achtung:Die Größen sind kleiner als üblich. Beachten
+        Sie bitte dieGrößentabelle.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/tshirt-nocloud-black.en.xml b/order/data/info/tshirt-nocloud-black.en.xml
new file mode 100644
index 0000000000..12a8b267d9
--- /dev/null
+++ b/order/data/info/tshirt-nocloud-black.en.xml
@@ -0,0 +1,14 @@
+
+
+1
+  
+    There is NO CLOUD, black
+    
+      
A must have for everybody who wants to remind others how important it is
+        to keep in control of one's own data.

+      

+        Note:Sizes are smaller than usual. Please have a look
+        at thesize chart.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/tshirt-nocloud-black.nl.xml b/order/data/info/tshirt-nocloud-black.nl.xml
new file mode 100644
index 0000000000..662e21d48f
--- /dev/null
+++ b/order/data/info/tshirt-nocloud-black.nl.xml
@@ -0,0 +1,11 @@
+
+
+1
+  
+    There is NO CLOUD, zwart
+    
+      
Iedereen die anderen eraan wil herinneren hoe belangrijk het is om  
+contole te hebben over de eigen data, kan niet zonder.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/tshirt-nocloud-black.sq.xml b/order/data/info/tshirt-nocloud-black.sq.xml
new file mode 100644
index 0000000000..9b422871aa
--- /dev/null
+++ b/order/data/info/tshirt-nocloud-black.sq.xml
@@ -0,0 +1,11 @@
+
+
+1
+  
+    There is NO CLOUD, e zezë
+    
+      
E domosdoshme për këdo që dëshiron t’u kujtojë të tjerëve se sa e rëndësishme është
+        të ruhet kontrolli i të dhënave të veta.

+    
+  
+
\ No newline at end of file
diff --git a/order/data/info/tshirt-nocloud-petrol.en.xml b/order/data/info/tshirt-nocloud-petrol.en.xml
new file mode 100644
index 0000000000..bec9db9998
--- /dev/null
+++ b/order/data/info/tshirt-nocloud-petrol.en.xml
@@ -0,0 +1,10 @@
+
+
+1
+  
+    There is NO CLOUD T-shirt, petrol green
+    
+      
An evergreen, but this time in petrol green

+    
+  
+
\ No newline at end of file
diff --git a/order/data/items.en.xml b/order/data/items.en.xml
new file mode 100644
index 0000000000..c441d98257
--- /dev/null
+++ b/order/data/items.en.xml
@@ -0,0 +1,129 @@
+
+
+
+  1
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+  
+  
+    
+    
+  
+  
+  
+    
+    
+    
+  
+  
+  
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+    
+  
+  
+    
+    
+    
+    
+    
+  
+  
+    
+    
+  
+  
+  
+  
+
diff --git a/order/2019/baby-bib-black-large.jpg b/order/data/pictures/baby-bib-black-large.jpg
similarity index 100%
rename from order/2019/baby-bib-black-large.jpg
rename to order/data/pictures/baby-bib-black-large.jpg
diff --git a/order/2019/baby-bib-black-small.jpg b/order/data/pictures/baby-bib-black-small.jpg
similarity index 100%
rename from order/2019/baby-bib-black-small.jpg
rename to order/data/pictures/baby-bib-black-small.jpg
diff --git a/order/2017/baby-bib-pink-large.png b/order/data/pictures/baby-bib-pink-large.png
similarity index 100%
rename from order/2017/baby-bib-pink-large.png
rename to order/data/pictures/baby-bib-pink-large.png
diff --git a/order/2017/baby-bib-pink-small.png b/order/data/pictures/baby-bib-pink-small.png
similarity index 100%
rename from order/2017/baby-bib-pink-small.png
rename to order/data/pictures/baby-bib-pink-small.png
diff --git a/order/2021/bag-since2001-blue-back-large.jpg b/order/data/pictures/bag-since2001-blue-back-large.jpg
similarity index 100%
rename from order/2021/bag-since2001-blue-back-large.jpg
rename to order/data/pictures/bag-since2001-blue-back-large.jpg
diff --git a/order/2021/bag-since2001-blue-back-small.jpg b/order/data/pictures/bag-since2001-blue-back-small.jpg
similarity index 100%
rename from order/2021/bag-since2001-blue-back-small.jpg
rename to order/data/pictures/bag-since2001-blue-back-small.jpg
diff --git a/order/2021/bag-since2001-blue-front-large.jpg b/order/data/pictures/bag-since2001-blue-front-large.jpg
similarity index 100%
rename from order/2021/bag-since2001-blue-front-large.jpg
rename to order/data/pictures/bag-since2001-blue-front-large.jpg
diff --git a/order/2021/bag-since2001-blue-front-small.jpg b/order/data/pictures/bag-since2001-blue-front-small.jpg
similarity index 100%
rename from order/2021/bag-since2001-blue-front-small.jpg
rename to order/data/pictures/bag-since2001-blue-front-small.jpg
diff --git a/order/2019/card-christmas-blue-large.jpg b/order/data/pictures/card-christmas-blue-large.jpg
similarity index 100%
rename from order/2019/card-christmas-blue-large.jpg
rename to order/data/pictures/card-christmas-blue-large.jpg
diff --git a/order/2019/card-christmas-blue-small.jpg b/order/data/pictures/card-christmas-blue-small.jpg
similarity index 100%
rename from order/2019/card-christmas-blue-small.jpg
rename to order/data/pictures/card-christmas-blue-small.jpg
diff --git a/order/2019/girlie-multilingual-black-back-large.jpg b/order/data/pictures/girlie-multilingual-black-back-large.jpg
similarity index 100%
rename from order/2019/girlie-multilingual-black-back-large.jpg
rename to order/data/pictures/girlie-multilingual-black-back-large.jpg
diff --git a/order/2019/girlie-multilingual-black-back-small.jpg b/order/data/pictures/girlie-multilingual-black-back-small.jpg
similarity index 100%
rename from order/2019/girlie-multilingual-black-back-small.jpg
rename to order/data/pictures/girlie-multilingual-black-back-small.jpg
diff --git a/order/2019/girlie-multilingual-black-front-large.jpg b/order/data/pictures/girlie-multilingual-black-front-large.jpg
similarity index 100%
rename from order/2019/girlie-multilingual-black-front-large.jpg
rename to order/data/pictures/girlie-multilingual-black-front-large.jpg
diff --git a/order/2019/girlie-multilingual-black-front-small.jpg b/order/data/pictures/girlie-multilingual-black-front-small.jpg
similarity index 100%
rename from order/2019/girlie-multilingual-black-front-small.jpg
rename to order/data/pictures/girlie-multilingual-black-front-small.jpg
diff --git a/order/2019/girlie-multilingual-blue-back-large.jpg b/order/data/pictures/girlie-multilingual-blue-back-large.jpg
similarity index 100%
rename from order/2019/girlie-multilingual-blue-back-large.jpg
rename to order/data/pictures/girlie-multilingual-blue-back-large.jpg
diff --git a/order/2019/girlie-multilingual-blue-back-small.jpg b/order/data/pictures/girlie-multilingual-blue-back-small.jpg
similarity index 100%
rename from order/2019/girlie-multilingual-blue-back-small.jpg
rename to order/data/pictures/girlie-multilingual-blue-back-small.jpg
diff --git a/order/2019/girlie-multilingual-blue-front-large.jpg b/order/data/pictures/girlie-multilingual-blue-front-large.jpg
similarity index 100%
rename from order/2019/girlie-multilingual-blue-front-large.jpg
rename to order/data/pictures/girlie-multilingual-blue-front-large.jpg
diff --git a/order/2019/girlie-multilingual-blue-front-small.jpg b/order/data/pictures/girlie-multilingual-blue-front-small.jpg
similarity index 100%
rename from order/2019/girlie-multilingual-blue-front-small.jpg
rename to order/data/pictures/girlie-multilingual-blue-front-small.jpg
diff --git a/order/2018/magnet-nocloud-blue-large.jpg b/order/data/pictures/magnet-nocloud-blue-large.jpg
similarity index 100%
rename from order/2018/magnet-nocloud-blue-large.jpg
rename to order/data/pictures/magnet-nocloud-blue-large.jpg
diff --git a/order/2018/magnet-nocloud-blue-small.jpg b/order/data/pictures/magnet-nocloud-blue-small.jpg
similarity index 100%
rename from order/2018/magnet-nocloud-blue-small.jpg
rename to order/data/pictures/magnet-nocloud-blue-small.jpg
diff --git a/order/2018/magnet-nocloud-white-large.jpg b/order/data/pictures/magnet-nocloud-white-large.jpg
similarity index 100%
rename from order/2018/magnet-nocloud-white-large.jpg
rename to order/data/pictures/magnet-nocloud-white-large.jpg
diff --git a/order/2018/magnet-nocloud-white-small.jpg b/order/data/pictures/magnet-nocloud-white-small.jpg
similarity index 100%
rename from order/2018/magnet-nocloud-white-small.jpg
rename to order/data/pictures/magnet-nocloud-white-small.jpg
diff --git a/order/2018/magnet-pmpc-black-large.jpg b/order/data/pictures/magnet-pmpc-black-large.jpg
similarity index 100%
rename from order/2018/magnet-pmpc-black-large.jpg
rename to order/data/pictures/magnet-pmpc-black-large.jpg
diff --git a/order/2018/magnet-pmpc-black-small.jpg b/order/data/pictures/magnet-pmpc-black-small.jpg
similarity index 100%
rename from order/2018/magnet-pmpc-black-small.jpg
rename to order/data/pictures/magnet-pmpc-black-small.jpg
diff --git a/order/2018/magnet-pmpc-white-large.jpg b/order/data/pictures/magnet-pmpc-white-large.jpg
similarity index 100%
rename from order/2018/magnet-pmpc-white-large.jpg
rename to order/data/pictures/magnet-pmpc-white-large.jpg
diff --git a/order/2018/magnet-pmpc-white-small.jpg b/order/data/pictures/magnet-pmpc-white-small.jpg
similarity index 100%
rename from order/2018/magnet-pmpc-white-small.jpg
rename to order/data/pictures/magnet-pmpc-white-small.jpg
diff --git a/order/2019/pin-fsfe-white-large.jpg b/order/data/pictures/pin-fsfe-white-large.jpg
similarity index 100%
rename from order/2019/pin-fsfe-white-large.jpg
rename to order/data/pictures/pin-fsfe-white-large.jpg
diff --git a/order/2019/pin-fsfe-white-small.jpg b/order/data/pictures/pin-fsfe-white-small.jpg
similarity index 100%
rename from order/2019/pin-fsfe-white-small.jpg
rename to order/data/pictures/pin-fsfe-white-small.jpg
diff --git a/order/2012/pin-gnu-silver-large.jpg b/order/data/pictures/pin-gnu-silver-large.jpg
similarity index 100%
rename from order/2012/pin-gnu-silver-large.jpg
rename to order/data/pictures/pin-gnu-silver-large.jpg
diff --git a/order/2012/pin-gnu-silver-small.jpg b/order/data/pictures/pin-gnu-silver-small.jpg
similarity index 100%
rename from order/2012/pin-gnu-silver-small.jpg
rename to order/data/pictures/pin-gnu-silver-small.jpg
diff --git a/order/2012/pin-plussy-green-large.jpg b/order/data/pictures/pin-plussy-green-large.jpg
similarity index 100%
rename from order/2012/pin-plussy-green-large.jpg
rename to order/data/pictures/pin-plussy-green-large.jpg
diff --git a/order/2012/pin-plussy-green-small.jpg b/order/data/pictures/pin-plussy-green-small.jpg
similarity index 100%
rename from order/2012/pin-plussy-green-small.jpg
rename to order/data/pictures/pin-plussy-green-small.jpg
diff --git a/order/2024/socks-ilovefs-large.jpg b/order/data/pictures/socks-ilovefs-large.jpg
similarity index 100%
rename from order/2024/socks-ilovefs-large.jpg
rename to order/data/pictures/socks-ilovefs-large.jpg
diff --git a/order/2024/socks-ilovefs-small.jpg b/order/data/pictures/socks-ilovefs-small.jpg
similarity index 100%
rename from order/2024/socks-ilovefs-small.jpg
rename to order/data/pictures/socks-ilovefs-small.jpg
diff --git a/order/2017/tshirt-100freedoms-black-back-large.jpg b/order/data/pictures/tshirt-100freedoms-black-back-large.jpg
similarity index 100%
rename from order/2017/tshirt-100freedoms-black-back-large.jpg
rename to order/data/pictures/tshirt-100freedoms-black-back-large.jpg
diff --git a/order/2017/tshirt-100freedoms-black-back-small.jpg b/order/data/pictures/tshirt-100freedoms-black-back-small.jpg
similarity index 100%
rename from order/2017/tshirt-100freedoms-black-back-small.jpg
rename to order/data/pictures/tshirt-100freedoms-black-back-small.jpg
diff --git a/order/2017/tshirt-100freedoms-black-front-large.jpg b/order/data/pictures/tshirt-100freedoms-black-front-large.jpg
similarity index 100%
rename from order/2017/tshirt-100freedoms-black-front-large.jpg
rename to order/data/pictures/tshirt-100freedoms-black-front-large.jpg
diff --git a/order/2017/tshirt-100freedoms-black-front-small.jpg b/order/data/pictures/tshirt-100freedoms-black-front-small.jpg
similarity index 100%
rename from order/2017/tshirt-100freedoms-black-front-small.jpg
rename to order/data/pictures/tshirt-100freedoms-black-front-small.jpg
diff --git a/order/2024/tshirt-H4F-back-large.jpg b/order/data/pictures/tshirt-H4F-back-large.jpg
similarity index 100%
rename from order/2024/tshirt-H4F-back-large.jpg
rename to order/data/pictures/tshirt-H4F-back-large.jpg
diff --git a/order/2024/tshirt-H4F-back-small.jpg b/order/data/pictures/tshirt-H4F-back-small.jpg
similarity index 100%
rename from order/2024/tshirt-H4F-back-small.jpg
rename to order/data/pictures/tshirt-H4F-back-small.jpg
diff --git a/order/2024/tshirt-H4F-front-large.jpg b/order/data/pictures/tshirt-H4F-front-large.jpg
similarity index 100%
rename from order/2024/tshirt-H4F-front-large.jpg
rename to order/data/pictures/tshirt-H4F-front-large.jpg
diff --git a/order/2024/tshirt-H4F-front-small.jpg b/order/data/pictures/tshirt-H4F-front-small.jpg
similarity index 100%
rename from order/2024/tshirt-H4F-front-small.jpg
rename to order/data/pictures/tshirt-H4F-front-small.jpg
diff --git a/order/2019/tshirt-multilingual-black-back-large.jpg b/order/data/pictures/tshirt-multilingual-black-back-large.jpg
similarity index 100%
rename from order/2019/tshirt-multilingual-black-back-large.jpg
rename to order/data/pictures/tshirt-multilingual-black-back-large.jpg
diff --git a/order/2019/tshirt-multilingual-black-back-small.jpg b/order/data/pictures/tshirt-multilingual-black-back-small.jpg
similarity index 100%
rename from order/2019/tshirt-multilingual-black-back-small.jpg
rename to order/data/pictures/tshirt-multilingual-black-back-small.jpg
diff --git a/order/2019/tshirt-multilingual-black-front-large.jpg b/order/data/pictures/tshirt-multilingual-black-front-large.jpg
similarity index 100%
rename from order/2019/tshirt-multilingual-black-front-large.jpg
rename to order/data/pictures/tshirt-multilingual-black-front-large.jpg
diff --git a/order/2019/tshirt-multilingual-black-front-small.jpg b/order/data/pictures/tshirt-multilingual-black-front-small.jpg
similarity index 100%
rename from order/2019/tshirt-multilingual-black-front-small.jpg
rename to order/data/pictures/tshirt-multilingual-black-front-small.jpg
diff --git a/order/2016/tshirt-nocloud-black-back-large.jpg b/order/data/pictures/tshirt-nocloud-black-back-large.jpg
similarity index 100%
rename from order/2016/tshirt-nocloud-black-back-large.jpg
rename to order/data/pictures/tshirt-nocloud-black-back-large.jpg
diff --git a/order/2016/tshirt-nocloud-black-back-small.jpg b/order/data/pictures/tshirt-nocloud-black-back-small.jpg
similarity index 100%
rename from order/2016/tshirt-nocloud-black-back-small.jpg
rename to order/data/pictures/tshirt-nocloud-black-back-small.jpg
diff --git a/order/2016/tshirt-nocloud-black-front-large.jpg b/order/data/pictures/tshirt-nocloud-black-front-large.jpg
similarity index 100%
rename from order/2016/tshirt-nocloud-black-front-large.jpg
rename to order/data/pictures/tshirt-nocloud-black-front-large.jpg
diff --git a/order/2016/tshirt-nocloud-black-front-small.jpg b/order/data/pictures/tshirt-nocloud-black-front-small.jpg
similarity index 100%
rename from order/2016/tshirt-nocloud-black-front-small.jpg
rename to order/data/pictures/tshirt-nocloud-black-front-small.jpg
diff --git a/order/2024/tshirt-nocloud-petrol-back-large.jpg b/order/data/pictures/tshirt-nocloud-petrol-back-large.jpg
similarity index 100%
rename from order/2024/tshirt-nocloud-petrol-back-large.jpg
rename to order/data/pictures/tshirt-nocloud-petrol-back-large.jpg
diff --git a/order/2024/tshirt-nocloud-petrol-back-small.jpg b/order/data/pictures/tshirt-nocloud-petrol-back-small.jpg
similarity index 100%
rename from order/2024/tshirt-nocloud-petrol-back-small.jpg
rename to order/data/pictures/tshirt-nocloud-petrol-back-small.jpg
diff --git a/order/2024/tshirt-nocloud-petrol-front-large.jpg b/order/data/pictures/tshirt-nocloud-petrol-front-large.jpg
similarity index 100%
rename from order/2024/tshirt-nocloud-petrol-front-large.jpg
rename to order/data/pictures/tshirt-nocloud-petrol-front-large.jpg
diff --git a/order/2024/tshirt-nocloud-petrol-front-small.jpg b/order/data/pictures/tshirt-nocloud-petrol-front-small.jpg
similarity index 100%
rename from order/2024/tshirt-nocloud-petrol-front-small.jpg
rename to order/data/pictures/tshirt-nocloud-petrol-front-small.jpg
diff --git a/order/order.sources b/order/order.sources
index 95b0d654a6..27c53a0a06 100644
--- a/order/order.sources
+++ b/order/order.sources
@@ -1,3 +1,3 @@
-order/*/item:[]
-order/*/info:[]
+order/data/items*:[]
+order/data/info/*:[]
 tools/countries:[]
diff --git a/order/order.xsl b/order/order.xsl
index c98ae1ba93..db7e56320b 100644
--- a/order/order.xsl
+++ b/order/order.xsl
@@ -128,21 +128,6 @@
                     
                   
                 
-
-                
-                
-                  hidden
-                  
-                    _
-                    
-                    _
-                    
-                  
-                  
-                    
-                  
-                
-
               
             
           
diff --git a/order/size.sources b/order/size.sources
index 904b327ada..21322bf5d5 100644
--- a/order/size.sources
+++ b/order/size.sources
@@ -1,2 +1,2 @@
-order/*/item:[]
-order/*/info:[]
+order/data/items:[]
+order/data/info:[]