Merge pull request 'Updating promo design credit and licensing' (#5261) from MarkusCredit into master

Reviewed-on: #5261
2025-08-27 14:03:53 +00:00
parent 28bcfb6607 634bf0602b
commit 7290c37397
24 changed files with 23 additions and 43 deletions
--- a/fsfe.org/contribute/promoitems/archived-items.en.xml
+++ b/fsfe.org/contribute/promoitems/archived-items.en.xml
@@ -13,31 +13,14 @@ 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" />
-  </item>
-
  <item type="fsfe" id="fsfe-folder" year="2005" order="2">
    <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="15y-fsfe-sticker" year="2016" order="2">
-    <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>

-  <!-- Free Software and users freedom -->
-  <item type="fsfreedom" id="nocloud-sticker" year="2015" order="1">
-    <image imgsmall="/contribute/promopics/thereisnocloud_thumb.png" />
-  </item>
-
  <item type="freedom" id="fs-and-tools" year="2014" order="0">
    <image imgsmall="/contribute/promopics/freiheit-thumb.png" />
  </item>
@@ -81,10 +64,6 @@ to every item in this file -->

  <!-- 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>
--- a/fsfe.org/contribute/promoitems/info-dfd-cartoon.en.xml
+++ b/fsfe.org/contribute/promoitems/info-dfd-cartoon.en.xml
@@ -25,7 +25,7 @@
      English version.
    </printed>
    <license><a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA 4.0</a></license>
-    <author>Jamie Cosley, April</author>
+    <author>Jamie Cosley, April; Markus Meier (print layout)</author>
    <source><a href="https://download.fsfe.org/advocacy/promomaterial/DFD/cartoon_sources.tar.gz">English - Cartoon only</a>, <a href="https://download.fsfe.org/advocacy/promomaterial/DFD/cartoon_and_open_formats_sources.tar.gz">English - Cartoon &amp; Open Formats</a></source> 
    <printready></printready>
  </info>
--- a/fsfe.org/contribute/promoitems/info-dfd-chance-poster.en.xml
+++ b/fsfe.org/contribute/promoitems/info-dfd-chance-poster.en.xml
@@ -22,7 +22,7 @@
      A3 &amp; A2; one side English, other side multi-lingual.
    </printed>
    <license><a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a></license>
-    <author>FSFE</author>
+    <author>Markus Meier (illustration); Free Software Foundation Europe (text)</author>
    <source><a href="https://download.fsfe.org/advocacy/promomaterial/DFD/">dfd-robots-poster* in download.fsfe.org</a></source> 
    <printready></printready>
  </info>
--- a/fsfe.org/contribute/promoitems/info-dfd-leaflet.en.xml
+++ b/fsfe.org/contribute/promoitems/info-dfd-leaflet.en.xml
@@ -24,7 +24,7 @@
      Deutsch, English, Español, Français, Türkçe
    </printed>
    <license><a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a></license>
-    <author>Free Software Foundation Europe</author>
+    <author>Free Software Foundation Europe; Markus Meier (print layout)</author>
    <source>
 		<a href="https://download.fsfe.org/advocacy/promomaterial/DFD/DFD_leaflet-intro_de_SOURCES.tar.gz">Deutsch</a>, <a href="https://download.fsfe.org/advocacy/promomaterial/DFD/DFD_leaflet-intro_en_SOURCES.tar.gz">English</a>
    </source> 
--- a/fsfe.org/contribute/promoitems/info-dfd-os-sticker-big.en.xml
+++ b/fsfe.org/contribute/promoitems/info-dfd-os-sticker-big.en.xml
@@ -21,7 +21,7 @@
 		English
    </printed>
    <license><a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA 4.0</a></license>
-    <author>Free Software Foundation Europe</author>
+    <author>Markus Meier (illustration and print layout); Free Software Foundation Europe</author>
    <source>
 		<a href="https://download.fsfe.org/advocacy/promomaterial/DFD/DFD_Protest_ROBOTS_120x120_sources.tar.gz">English</a>
    </source> 
--- a/fsfe.org/contribute/promoitems/info-dfd-os-sticker.en.xml
+++ b/fsfe.org/contribute/promoitems/info-dfd-os-sticker.en.xml
@@ -21,7 +21,7 @@
 		English
    </printed>
    <license><a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA 4.0</a></license>
-    <author>Free Software Foundation Europe</author>
+    <author>Markus Meier (illustration and print layout); Free Software Foundation Europe</author>
    <source>
 		<a href="https://download.fsfe.org/advocacy/promomaterial/DFD/DFD_Protest_ROBOTS_74x74_sources.tar.gz">English</a>
    </source> 
--- a/fsfe.org/contribute/promoitems/info-fdroid-leaflet.en.xml
+++ b/fsfe.org/contribute/promoitems/info-fdroid-leaflet.en.xml
@@ -29,7 +29,7 @@
      Deutsch, English, Français, Italiano
    </printed>
    <license><a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA 4.0</a></license>
-    <author>Free Software Foundation Europe</author>
+    <author>Free Software Foundation Europe; Markus Meier (print layout)</author>
    <source>
      <a href="https://download.fsfe.org/advocacy/promomaterial/FYA/Fdroid-leaflet/" title="F-Droid leaflet sources">F-droid_folder.* in download.fsfe.org</a>
 	</source> 
--- a/fsfe.org/contribute/promoitems/info-fedigov-sticker.en.xml
+++ b/fsfe.org/contribute/promoitems/info-fedigov-sticker.en.xml
@@ -21,7 +21,7 @@
      English
    </printed>
    <license><a href="https://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA 3.0</a></license>
-    <author>Ralf Hersel, Lioh Moeller, Markus Meier</author>
+    <author>Ralf Hersel, Lioh Moeller; Markus Meier (print layout)</author>
    <source><a href="https://download.fsfe.org/advocacy/stickers/fedigov/">sticker in download.fsfe.org</a></source> 
    <printready></printready>
  </info>
--- a/fsfe.org/contribute/promoitems/info-freedom-fstools-leaflet.en.xml
+++ b/fsfe.org/contribute/promoitems/info-freedom-fstools-leaflet.en.xml
@@ -27,7 +27,7 @@
      Deutsch, English, Français, Polski, Shqip
    </printed>
    <license><a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA 4.0</a></license>
-    <author>Free Software Foundation Europe</author>
+    <author>Free Software Foundation Europe; Markus Meier (print layout)</author>
    <source>
 		<a href="https://download.fsfe.org/advocacy/promomaterial/FStools/">leaflet-fs-and-tools.* in download.fsfe.org</a>
 	</source> 
--- a/fsfe.org/contribute/promoitems/info-fsfe-folder.en.xml
+++ b/fsfe.org/contribute/promoitems/info-fsfe-folder.en.xml
@@ -14,5 +14,6 @@
    <languages><a href="https://download.fsfe.org/advocacy/promomaterial/FSFE/folder.en.F.pdf">English</a>, <a href="https://download.fsfe.org/advocacy/promomaterial/FSFE/folder.de.F.pdf">German</a></languages>
    <printed><span style="color:red">Unfortunately, FSFE folders in A5 are out of stock at the moment</span></printed>
    <license><a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA 4.0</a></license>
+    <author>Nils Buhlert</author>
  </info>
 </infoset>
--- a/fsfe.org/contribute/promoitems/info-fsfe-free-software-facts-2sided.en.xml
+++ b/fsfe.org/contribute/promoitems/info-fsfe-free-software-facts-2sided.en.xml
@@ -23,7 +23,7 @@
      English
    </printed>
    <license><a href="https://creativecommons.org/publicdomain/zero/1.0/">CC0</a></license>
-    <author>Ura Design and Markus Meier</author>
+    <author>Ura Design, Markus Meier (final artwork and print template)</author>
    <source><a href="https://download.fsfe.org/advocacy/promomaterial/FSFE/facts-about-freesoftware/REINZEICHNUNG/">Facts about Free Software-poster* in download.fsfe.org</a></source> 
    <printready></printready>
  </info>
--- a/fsfe.org/contribute/promoitems/info-fsfe-modernize-your-it-2sided.en.xml
+++ b/fsfe.org/contribute/promoitems/info-fsfe-modernize-your-it-2sided.en.xml
@@ -23,7 +23,7 @@
      English
    </printed>
    <license><a href="https://creativecommons.org/publicdomain/zero/1.0/">CC0</a></license>
-    <author>Ura Design and Markus Meier</author>
+    <author>Ura Design, Markus Meier (final artwork and print template)</author>
    <source><a href="https://download.fsfe.org/advocacy/promomaterial/FSFE/facts-about-freesoftware/REINZEICHNUNG/">modernise your IT-poster* in download.fsfe.org</a></source> 
    <printready></printready>
  </info>
--- a/fsfe.org/contribute/promoitems/info-fsfe-women-sticker-round.en.xml
+++ b/fsfe.org/contribute/promoitems/info-fsfe-women-sticker-round.en.xml
@@ -22,7 +22,7 @@
      English
    </printed>
    <license><a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA 4.0</a></license>
-    <author>Markus Meier</author>
+    <author>Marlene Kietreiber (logo); Markus Meier (sticker design and print template)</author>
    <source><a href="https://download.fsfe.org/advocacy/promomaterial/FSFE/FSFEwomen/">FSFE women sticker in download.fsfe.org</a></source> 
    <printready></printready>
  </info>
--- a/fsfe.org/contribute/promoitems/info-fsfe-women-sticker.en.xml
+++ b/fsfe.org/contribute/promoitems/info-fsfe-women-sticker.en.xml
@@ -22,7 +22,7 @@
      English
    </printed>
    <license><a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA 4.0</a></license>
-    <author>Markus Meier</author>
+    <author>Marlene Kietreiber (logo); Markus Meier (sticker design and print template)</author>
    <source><a href="https://download.fsfe.org/advocacy/promomaterial/FSFE/FSFEwomen/">FSFE women sticker in download.fsfe.org</a></source> 
    <printready></printready>
  </info>
--- a/fsfe.org/contribute/promoitems/info-ilovefs-balloon.en.xml
+++ b/fsfe.org/contribute/promoitems/info-ilovefs-balloon.en.xml
@@ -17,7 +17,7 @@
      English
    </printed>
    <license><a href="https://creativecommons.org/publicdomain/zero/1.0/">CC0</a></license>
-    <author>Markus Meier</author>
+    <author>Markus Meier (graphic); Free Software Foundation Europe (text)</author>
    <printready></printready>
  </info>

--- a/fsfe.org/contribute/promoitems/info-ilovefs-burgundy-sticker.en.xml
+++ b/fsfe.org/contribute/promoitems/info-ilovefs-burgundy-sticker.en.xml
@@ -20,7 +20,7 @@
    <printed>
      English
    </printed>
-    <license><a href="https://creativecommons.org/publicdomain/zero/1.0/">CC0</a></license>
+    <license><a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA 4.0</a></license>
    <author>Markus Meier</author>
    <source><a href="https://download.fsfe.org/advocacy/promomaterial/IloveFS/IloveFS-sticker/">ilovefs-sticker* in download.fsfe.org</a></source>
    <printready></printready>
--- a/fsfe.org/contribute/promoitems/info-ilovefs-sticker.en.xml
+++ b/fsfe.org/contribute/promoitems/info-ilovefs-sticker.en.xml
@@ -20,7 +20,7 @@
    <printed>
      English
    </printed>
-    <license><a href="https://creativecommons.org/publicdomain/zero/1.0/">CC0</a></license>
+    <license><a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA 4.0</a></license>
    <author>Markus Meier</author>
    <source><a href="https://download.fsfe.org/advocacy/promomaterial/IloveFS/IloveFS-sticker/">ilovefs-sticker* in download.fsfe.org</a></source> 
    <printready></printready>
--- a/fsfe.org/contribute/promoitems/info-join-the-movement-postcard.en.xml
+++ b/fsfe.org/contribute/promoitems/info-join-the-movement-postcard.en.xml
@@ -22,7 +22,7 @@
     PDF (English)
    </printed>
    <license><a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA 4.0</a></license>
-    <author>Sandra Brandstätter</author>
+    <author>Sandra Brandstätter (illustration); Markus Meier (postcard design)</author>
    <source><a href="https://download.fsfe.org/advocacy/promomaterial/FSFE/JoinTheMovement/FSFE_ADA_ZANGEMANN_postcard.pdf">Join the Software Freedom Movement Postcard in download.fsfe.org</a></source> 
    <printready></printready>
  </info>
--- a/fsfe.org/contribute/promoitems/info-join-the-movement-poster.en.xml
+++ b/fsfe.org/contribute/promoitems/info-join-the-movement-poster.en.xml
@@ -22,7 +22,7 @@
      PDF (English)
    </printed>
    <license><a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA 4.0</a></license>
-    <author>Sandra Brandstätter</author>
+    <author>Sandra Brandstätter (illustration); Markus Meier (poster design)</author>
    <source><a href="https://download.fsfe.org/advocacy/promomaterial/FSFE/JoinTheMovement/FSFE_ADA_ZANGEMANN_poster_A2.pdf">Join the Software Freedom Movement Poster in download.fsfe.org</a></source> 
    <printready></printready>
  </info>
--- a/fsfe.org/contribute/promoitems/info-pmpc-brochure.en.xml
+++ b/fsfe.org/contribute/promoitems/info-pmpc-brochure.en.xml
@@ -30,7 +30,7 @@
      Italian
    </printed>
    <license><a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA 4.0</a></license>
-    <author>Markus Meier</author>
+    <author>Markus Meier (design and layout); Free Software Foundation Europe (text)</author>
    <printready></printready>
    <source><a href="https://download.fsfe.org/advocacy/promomaterial/PMPC/sources/FSFE_PMPC_Brochure-en-v1.tar.gz">FSFE_PMPC_Brochure-en-v1.tar.gz in download.fsfe.org</a></source>
  </info>
--- a/fsfe.org/contribute/promoitems/info-pmpc-postcard.en.xml
+++ b/fsfe.org/contribute/promoitems/info-pmpc-postcard.en.xml
@@ -21,7 +21,7 @@
      English.
    </printed>
    <license><a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA 4.0</a></license>
-    <author>Markus Meier</author>
+    <author>Markus Meier (logo); Free Software Foundation Europe (postcard design)</author>
    <source><a href="https://download.fsfe.org/advocacy/promomaterial/PMPC/sources/PMPC_postcard_empty_back.sla">PMPC_postcard_empty_back.sla in download.fsfe.org</a></source>
    <printready></printready>
  </info>
--- a/fsfe.org/contribute/promoitems/info-pmpc-poster.en.xml
+++ b/fsfe.org/contribute/promoitems/info-pmpc-poster.en.xml
@@ -24,7 +24,7 @@
      English
    </printed>
    <license><a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA 4.0</a></license>
-    <author>Markus Meier</author>
+    <author>Markus Meier (logo); Free Software Foundation Europe (text)</author>
    <source><a href="https://download.fsfe.org/advocacy/promomaterial/PMPC/sources/FSFE_PMPC_Poster_A2.sla">FSFE_PMPC_Poster_A2.sla in download.fsfe.org</a></source>
    <printready></printready>
  </info>
--- a/fsfe.org/contribute/promoitems/info-ua-leaflet.en.xml
+++ b/fsfe.org/contribute/promoitems/info-ua-leaflet.en.xml
@@ -22,7 +22,7 @@
      English
    </printed>
    <license><a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA 4.0</a></license>
-    <author>Markus Meier</author>
+    <author>Markus Meier (leaflet design); Free Software Foundation Europe (text)</author>
    <source><a href="https://download.fsfe.org/advocacy/promomaterial/UpcyclingAndroid/">Upcycling Android Leaflet* in download.fsfe.org</a></source> 
    <printready></printready>
  </info>
--- a/fsfe.org/contribute/promoitems/info-ua-poster.en.xml
+++ b/fsfe.org/contribute/promoitems/info-ua-poster.en.xml
@@ -22,7 +22,7 @@
      English
    </printed>
    <license><a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA 4.0</a></license>
-    <author>Markus Meier</author>
+    <author>Markus Meier (poster design); Free Software Foundation Europe (text)</author>
    <source><a href="https://download.fsfe.org/advocacy/promomaterial/UpcyclingAndroid/">Upcycling Android Poster* in download.fsfe.org</a></source> 
    <printready></printready>
  </info>