timeline/proofread/EN (#6071)

Reviewed-on: #6071
Co-authored-by: silviarbgl <silviarbgl@fsfe.org>

.gitignore

@@ -15,10 +15,7 @@ __pycache__
 #phpcsfixer cache
 .php-cs-fixer.cache
 # Secrets
-# docker compose
+# general secrets
 .env
-# drone
-secrets.txt
-drone_token.txt
 # editors
 .vscode

README.md

@@ -14,7 +14,7 @@ This repository contains the source files of [fsfe.org](https://fsfe.org), pdfre
 
 Our web team has compiled some information about technology used for this website on the [Information for Webmasters](https://fsfe.org/contribute/web/) page. This is mainly focused on page content.
 
-For information on how the build process works see [docs subfolder](./docs/overview.md). For more information on contributing to the buid process, please see the [contributor docs](./docs/contributing.md) for some useful tips.
+For information on how the build process works see [docs subfolder](./docs/overview.md). For more information on contributing to the build process, please see the [contributor docs](./docs/contributing.md) for some useful tips.
 
 Some tips for management can be found in the [management docs](./docs/management.md)
 
@@ -84,11 +84,11 @@ Alterations to build scripts or the files used site-wide will result in near ful
 
 ### Native
 
-We can either install the required dependencies manually using our preferred package manager. If you are a nix use one can run `nix-shell` to enter a shell with the required build dependencies.
+We can either install the required dependencies manually using our preferred package manager. If you are a nix use one can run `nix-shell` to enter a shell with the required build dependencies. It will also provision `drone-cli` for signing the CI file after changing it, and load the values in `.env` into your current shell.
 
 If installing manually, you need the python package `uv` and the node package `lessc`.
 
-Also needed are the libraries
+This also requires
 
 ```
 libxml2 libxslt
@@ -102,27 +102,21 @@ The pages can be built and served by running `uv run build`. Try `--help` for mo
 
 > Docker is used on the build server, so you can use this to replicate the exact behavior
 > **Advantage**: Reproducibility, no changes on the host system
-> **Disadvantage**: Docker breaks sometimes, bigger install size, more network usage
+> **Disadvantage**: Bigger install size, more network usage
 
 The docker build process is in some ways designed for deployment. This means that it expects some environment variables to be set to function. Namely, it will try and load ssh credentials and git credentials, and docker does not support providing default values to these.
 
 So, to stub out this functionality, please set the environment variables
-`FSFE_WEBSITE_KEY_PRIVATE FSFE_WEBSITE_KEY_PASSWORD FSFE_WEBSITE_GIT_TOKEN` to equal `none` when running docker. One can set them for the shell session, an example in bash is seen below.
+`FSFE_WEBSITE_KEY_PRIVATE FSFE_WEBSITE_KEY_PASSWORD FSFE_WEBSITE_GIT_TOKEN` to equal `none` when running docker. They can be set using a `.env` file in the report root, using a simple key value syntax, E.G
 
-```
-export FSFE_WEBSITE_KEY_PRIVATE=none;
-export FSFE_WEBSITE_KEY_PASSWORD=none;
-export FSFE_WEBSITE_GIT_TOKEN=none;
+```sh
+FSFE_WEBSITE_KEY_PRIVATE=none
+FSFE_WEBSITE_KEY_PASSWORD=none
+FSFE_WEBSITE_GIT_TOKEN=none
 ```
 
 One can then run Docker commands like `docker compose ...`.
 
-Alternatively one can prefix the Docker commands with the required variables, like so
-
-```
-FSFE_WEBSITE_KEY_PRIVATE=none FSFE_WEBSITE_KEY_PASSWORD=none FSFE_WEBSITE_GIT_TOKEN=none docker compose
-```
-
 Once your preferred method has been chosen, simply running `docker compose run --service-ports build --serve` should build the webpages and make them available over localhost.
 
 Some more explanation: we are essentially just using docker as a way to provide dependencies and then running the build script. All flags after `build` are passed to the `build` cli. The `service-ports` flag is required to open ports from the container for serving the output, not needed if not using the `--serve` flag of the build script.

build.Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:trixie-20260623
+FROM debian:13
 
 COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
 

build/fsfe_website_build/globals.py

@@ -10,3 +10,5 @@ from platformdirs import user_cache_dir
 APP_NAME = "fsfe-website-build"
 
 CACHE_DIR = Path(user_cache_dir(APP_NAME, "fsfe"))
+
+FALLBACK_LANG = "en"

build/fsfe_website_build/lib/misc.py

@@ -10,6 +10,8 @@ from typing import TYPE_CHECKING, Any, cast
 
 from lxml import etree
 
+from fsfe_website_build.globals import FALLBACK_LANG
+
 if TYPE_CHECKING:
     from pathlib import Path
 
@@ -139,7 +141,7 @@ def get_localised_file(base_file: Path, lang: str, suffix: str) -> Path | None:
         else fallback
         if (
             fallback := base_file.with_suffix(
-                base_file.suffix + ".en" + normalised_suffix
+                base_file.suffix + "." + FALLBACK_LANG + normalised_suffix
             )
         ).exists()
         else None

build/fsfe_website_build/lib/process_file.py

@@ -11,6 +11,7 @@ from typing import TYPE_CHECKING, Any
 
 from lxml import etree
 
+from fsfe_website_build.globals import FALLBACK_LANG
 from fsfe_website_build.lib.misc import get_basename, get_version, lang_from_filename
 
 if TYPE_CHECKING:
@@ -86,7 +87,7 @@ def _get_set(
                 path_xml = (
                     path.with_suffix(f".{lang}.xml")
                     if path.with_suffix(f".{lang}.xml").exists()
-                    else path.with_suffix(".en.xml")
+                    else path.with_suffix(f".{FALLBACK_LANG}.xml")
                 )
                 doc_set.extend(_get_xmls(path_xml, parser))
 
@@ -128,8 +129,10 @@ def _build_xmlstream(
     )
     logger.debug("file lang list: %s", lang_lst)
     original_lang = (
-        "en"
-        if infile.with_suffix("").with_suffix(f".en{infile.suffix}").exists()
+        FALLBACK_LANG
+        if infile.with_suffix("")
+        .with_suffix(f".{FALLBACK_LANG}{infile.suffix}")
+        .exists()
         else sorted(
             infile.parent.glob(f"{get_basename(infile)}.??{infile.suffix}"),
             key=get_version,
@@ -187,7 +190,9 @@ def _build_xmlstream(
 
     textsetbackup = etree.SubElement(page, "textsetbackup")
     textsetbackup.extend(
-        _get_xmls(source.joinpath("global/data/texts/texts.en.xml"), parser)
+        _get_xmls(
+            source.joinpath(f"global/data/texts/texts.{FALLBACK_LANG}.xml"), parser
+        )
     )
 
     textset = etree.SubElement(page, "textset")

build/fsfe_website_build/phase0/global_symlinks.py

@@ -7,6 +7,8 @@ import logging
 from itertools import product
 from typing import TYPE_CHECKING
 
+from fsfe_website_build.globals import FALLBACK_LANG
+
 if TYPE_CHECKING:
     import multiprocessing.pool
     from pathlib import Path
@@ -19,7 +21,7 @@ def _do_symlinking(source: Path, link_type: str, lang: str) -> None:
     target = (
         source.joinpath(f"global/data/{link_type}/{link_type}.{lang}.xml")
         if source.joinpath(f"global/data/{link_type}/{link_type}.{lang}.xml").exists()
-        else source.joinpath(f"global/data/{link_type}/{link_type}.en.xml")
+        else source.joinpath(f"global/data/{link_type}/{link_type}.{FALLBACK_LANG}.xml")
     )
     source_xml = source.joinpath(f"global/data/{link_type}/.{link_type}.{lang}.xml")
     if not source_xml.exists():

build/fsfe_website_build/phase1/update_localmenus.py

@@ -14,6 +14,7 @@ from typing import TYPE_CHECKING
 
 from lxml import etree
 
+from fsfe_website_build.globals import FALLBACK_LANG
 from fsfe_website_build.lib.misc import (
     get_basepath,
     get_localised_file,
@@ -101,7 +102,9 @@ def update_localmenus(
             [
                 (
                     not (
-                        localmenu_path := directory.joinpath(".localmenu.en.xml")
+                        localmenu_path := directory.joinpath(
+                            f".localmenu.{FALLBACK_LANG}.xml"
+                        )
                     ).exists()
                 )
                 or (file.stat().st_mtime > localmenu_path.stat().st_mtime)

build/fsfe_website_build/phase1/update_xmllists.py

@@ -5,7 +5,7 @@
 
 After this step, the following files will be up to date:
 * <dir>/.<base>.xmllist for each <dir>/<base>.sources as well as for each
-  $site/tags/tagged-<tags>.en.xhtml.
+  $site/tags/tagged-<tags>.$FALLBACK_LANG.xhtml.
   These files are used in phase 2 to include the
   correct XML files when generating the HTML pages. It is taken care that
   these files are only updated whenever their content actually changes, so
@@ -180,7 +180,8 @@ def update_xmllists(
      Creates/update the following files:
 
     * <dir>/.<base>.xmllist for each <dir>/<base>.sources as well as for each
-      fsfe.org/tags/tagged-<tags>.en.xhtml. These files are used in phase 2 to include
+      fsfe.org/tags/tagged-<tags>.$FALLBACK_LANG.xhtml.
+      These files are used in phase 2 to include
       the correct XML files when generating the HTML pages. It is taken care that
       these files are only updated whenever their content actually changes, so
       they can serve as a prerequisite in the phase 2 Makefile.

build/fsfe_website_build/phase2/create_index_symlinks.py

@@ -5,8 +5,8 @@
 
 For directories with no existing index,
 where there is a file with the same name as the parent folder,
-EG about/about.en.html
-generate a symlink from about/index.en.html to about.en.html
+EG about/about.$FALLBACK_LANG.html
+generate a symlink from about/index.$FALLBACK_LANG.html to about.$FALLBACK_LANG.html
 """
 
 import logging

build/fsfe_website_build/phase2/process_files.py

@@ -16,6 +16,7 @@ from typing import TYPE_CHECKING
 
 from lxml import etree
 
+from fsfe_website_build.globals import FALLBACK_LANG
 from fsfe_website_build.lib.misc import get_basepath
 from fsfe_website_build.lib.process_file import process_file
 
@@ -68,7 +69,7 @@ def _process_set(  # noqa: PLR0913
                     (
                         source_file
                         if source_file.exists()
-                        else Path(str(basepath) + ".en.xhtml")
+                        else Path(str(basepath) + f".{FALLBACK_LANG}.xhtml")
                     ),
                     processor,
                     (
@@ -78,7 +79,7 @@ def _process_set(  # noqa: PLR0913
                     ),
                     Path(f"global/data/texts/.texts.{lang}.xml"),
                     Path(f"global/data/topbanner/.topbanner.{lang}.xml"),
-                    Path("global/data/texts/texts.en.xml"),
+                    Path(f"global/data/texts/texts.{FALLBACK_LANG}.xml"),
                 ]
             ),
         ):

build/fsfe_website_build/phase3/serve_websites.py

@@ -7,16 +7,17 @@ import http.server
 import logging
 import multiprocessing
 import os
-import shutil
 import socketserver
+import time
+import webbrowser
 from pathlib import Path
 
-from fsfe_website_build.lib.misc import run_command
+from fsfe_website_build.globals import FALLBACK_LANG
 
 logger = logging.getLogger(__name__)
 
 
-def _run_webserver(path: str, port: int) -> None:
+def _run_webserver(path: Path, port: int) -> None:
     """Given a path and a port it will serve that dir on that localhost:port."""
     os.chdir(path)
     handler = http.server.SimpleHTTPRequestHandler
@@ -40,13 +41,19 @@ def serve_websites(
         for path in Path(serve_dir).iterdir()
         if (path.is_dir() and (path.name in site_names))
     )
-    serves: list[tuple[str, int]] = []
+    serves: list[tuple[Path, int]] = []
     for index, directory in enumerate(dirs):
         port = base_port + (increment_number * index)
-        url = f"http://127.0.0.1:{port}"
-        logger.info("%s served at %s", directory.name, url)
-        if shutil.which("xdg-open") is not None:
-            run_command(["xdg-open", url + "/index.en.html"])
-        serves.append((str(directory), port))
+        serves.append((directory, port))
     with multiprocessing.Pool(len(serves)) as pool:
-        pool.starmap(_run_webserver, serves)
+        pool.starmap_async(_run_webserver, serves)
+        for directory, port in serves:
+            url = f"http://127.0.0.1:{port}"
+            logger.info("%s served at %s", directory.name, url)
+            webbrowser.open(url + f"/index.{FALLBACK_LANG}.html")
+        # Keep pool alive until interrupted
+        try:
+            while True:
+                time.sleep(1)
+        except KeyboardInterrupt:
+            logger.info("shutting down")

drone-shell.nix

@@ -1,41 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Free Software Foundation Europe <https://fsfe.org>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-{ pkgs ? import <nixpkgs> {} }:
-
-pkgs.mkShell {
-  # we assume the repo is cloned so git is available
-  # we assume awk is present
-  buildInputs = with pkgs; [
-    drone-cli # signing
-  ];
-  shellHook = ''
-  # GIT
-  if ! git remote get-url upstream > /dev/null 2>&1 ; then
-     # REVIEW(fkobi): this could get annoying if for some reason people do not want the upstream
-     git remote add upstream git@git.fsfe.org:fsfe-system-hackers/hugo-container.git
-
-     git config branch.main.pushRemote origin
-  fi
-
-  # DRONE
-  export DRONE_SERVER=https://drone.fsfe.org
-  export DRONE_TOKEN
-
-  DRONE_FILE=drone_token.txt
-  if [[ -r $DRONE_FILE ]]; then
-     DRONE_TOKEN=$(cat $DRONE_FILE)
-  else
-     echo "Insert your drone token (found at $DRONE_SERVER/account)"
-     read -r -p "Token: " DRONE_TOKEN
-     echo -n $DRONE_TOKEN > $DRONE_FILE
-  fi
-  unset DRONE_FILE
-
-  REPO_NAME="$(git remote get-url origin | awk -F "[:.]" '{printf $4}')"
-  alias save="drone sign --save $REPO_NAME && printf 'Hash saved!' && git add .drone.yml"
-
-  echo "You are working on $REPO_NAME repository."
-  echo "Use the \"save\" alias to drone sign and git commit your drone.yml changes."
-  '';
-}

fsfe.org/.htaccess

@@ -41,6 +41,9 @@ RewriteRule ^community/events/2016/summit/backsight(/.*)?$  /events/2016/summit/
 # 15 years of FSFE
 RewriteRule ^15(/.*)?$    /activities/15years$1 [R=301,L]
 
+# 25 years of FSFE
+RewriteRule ^about\/summermeeting-schedule(.*)?$    /activities/fsfe25/index$1 [R=301,L]
+
 # Podcast
 RewriteRule ^podcast(/.*)? /news/podcast.html [R=301,L]
 
@@ -274,6 +277,7 @@ RewriteRule ^community/projects-call(/.*)?$ /contact/projects-call$1 [R=301,L]
 RewriteRule ^community/groups(/.*)?$ /about/groups$1 [R=301,L]
 RewriteRule ^potteries/?$ https://wiki.fsfe.org/LocalGroups/Potteries [R=301,L]
 RewriteRule ^berlin/?$ https://wiki.fsfe.org/LocalGroups/Berlin [R=301,L]
+RewriteRule ^contact$ /about/contact [R=301,L]
 
 # Legal Questions
 RewriteRule ^activities/licence-questions/licence-questions(.*)?$ /freesoftware/legal/faq$1 [R=301,L]

fsfe.org/about/about.en.xhtml

@@ -46,6 +46,7 @@
             why we  concentrate our daily work on three main pillars: public awareness,
             policy advocacy, and legal support.
           </p>
+        <p>See how far the FSFE has come. <a href="/about/timeline.html">Explore our timeline with our key achievements</a>.</p>
         </div>
       </li>
 

fsfe.org/about/mission.de.xhtml

@@ -31,6 +31,32 @@
       <li>ermutigt Menschen zum Einsatz und zur Entwicklung Freier Software,</li>
       <li>stellt Ressourcen für alle bereit, die Freie Software in Europa voranbringen wollen.</li>
     </ul>
+      
+  <h2>Die Vision für 2048 der FSFE</h2>
+
+<p>Unsere Vision für das Jahr 2028:</p>
+
+<figure>
+	<img src="https://pics.fsfe.org/uploads/medium/97/4f/5ed146cb41dcdf257f3648f8bfb7.jpg" alt="A slide showing the number 2048 in white. The blue background looks like it has the silhouette of an government building "/>
+		 </figure>
+
+<div>
+<ul>
+<li><strong>Alle Menschen haben das Recht, jede Software auf allen ihrer Geräte zu installieren oder zu deinstallieren!</strong></li>
+
+<li><strong>Alle öffentlichen Mittel für Software sollten nur für Freie Software verwendet werden! </strong> <br/> Dieser Grundsatz steht seit langem im Mittelpunkt unserer Bemühungen und wir werden auch in Zukunft verschiedene Aktivitäten unter dem Motto „Public Money? Public Code!“ durchführen.</li>
+
+<li><strong> Alle rechtlichen Rahmenbedingungen fördern den Einsatz und die Entwicklung von Freier Software.</strong> <br/>Wir wollen, dass die rechtlichen Rahmenbedingungen diese Beiträge anerkennen, indem sie Unternehmen und Organisationen Anreize für die Entwicklung und Nutzung Freier Software bieten.</li>
+
+<li><strong>Rechtliche und lizenzrechtliche Entscheidungen beruhen auf Fakten anstelle von Angst, Unsicherheit und Zweifel.</strong> <br/>  Wer zu Freier Software beiträgt, sollte sich darauf konzentrieren können, einen positiven Beitrag zur Gesellschaft zu leisten, ohne sich ständig um rechtliche Fragen sorgen zu müssen.</li>
+
+<li><strong>Junge Menschen haben die Möglichkeit, zu basteln, zu 
+experimentieren und zu programmieren, wobei Freie Software dabei der 
+Standard ist. </strong></li> 
+</ul> </div>
+
+<p>Wirf einen Blick auf unsere wichtigsten Erfolge in den verschiedenen Bereichen. <a href="/about/timeline/index.html">Erkunde unsere Chronik</a>. </p>
+   
        
   </body>
   <followup>join</followup>

fsfe.org/about/mission.en.xhtml

@@ -8,28 +8,72 @@
 
   <body>
 		<p id="category"><a href="/about/">About</a></p>
-    <h1>FSFE's mission</h1>
+    <h1>The FSFE's mission and vision</h1>
+
     
     <div id="introduction">
-      <p>Free Software Foundation Europe is a charity that empowers users to
+      <p>The Free Software Foundation Europe is a charity that empowers users to
       control technology.</p>
     </div>
 
     <p>Software is deeply involved in all aspects of our
     lives. It is important that this technology empowers rather than
-    restricts us. <a href="/freesoftware/freesoftware.html">Free Software</a> gives everybody the rights to use, understand,
+    restricts us. <a href="/freesoftware/freesoftware.html">Free 
+    Software</a> gives everybody the rights to use, understand,
     adapt, and share software. These rights help support other fundamental
     rights like freedom of speech, freedom of press, and privacy.</p>
 
-    <p>Free Software Foundation Europe:</p>
+    <p>The Free Software Foundation Europe:</p>
 
     <ul>
-      <li>helps individuals and organisations to understand how Free Software contributes to freedom, transparency, and self-determination.</li>
+      <li>
+      helps individuals and organisations to understand how Free 
+      Software contributes to freedom, transparency, and 
+      self-determination.
+      </li>
       <li>enhances users' rights by abolishing barriers to Free Software adoption.</li>
       <li>encourages people to use and develop Free Software.</li>
       <li>provides resources to enable everyone to further promote Free Software in Europe.</li>
     </ul>
+
+    <h2>The FSFE's vision 2048</h2>
        
+
+<p>Our vision for the year 2048:</p>
+
+<figure>
+	<img src="https://pics.fsfe.org/uploads/medium/97/4f/5ed146cb41dcdf257f3648f8bfb7.jpg" alt="A slide showing the number 2048 in white. The blue background looks like it has the silhouette of an government building "/>
+		 </figure>
+
+
+
+<div>
+<ul>
+<li><strong>Everyone has the right to remove and install any software on any
+of their devices!</strong></li>
+
+<li><strong>All public funding for software should be for Free Software only!</strong> <br/> 
+This principle has been at the heart of our efforts, and we continue to
+advance it through various initiatives under the "Public Money? Public
+Code!" motto.</li>
+
+<li><strong>All regulatory frameworks encourage the use and development of
+Free Software.</strong> <br/> In recent years we have witnessed an increase in
+regulation in our field of work. We want regulatory frameworks to recognise those
+contributions, by incentivising companies and organisations to develop
+and use Free Software.</li>
+
+<li><strong>Licensing and legal decisions are based on facts, rather than
+fear, uncertainty, and doubt.</strong><br/> Free Software contributors should be able
+to focus on contributing to society without constantly worrying about
+legal issues.</li>
+
+<li><strong>Young people have the opportunity to tinker, experiment and code
+with Free Software as the default. </strong></li>
+</ul>
+</div>
+
+      <p>Take a look at our most important achievements in different areas. <a href="/about/timeline/index.html">Explore our timeline</a>. </p>
   </body>
   <followup>join</followup>
 <translator/>

fsfe.org/about/mission.es.xhtml

@@ -27,8 +27,37 @@
       <li>anima a la gente a utilizar y desarrollar Software Libre.</li>
       <li>proporciona recursos para que todo el mundo pueda seguir promoviendo el software libre en Europa</li>
     </ul>
+     
+  <h2>La visión 2048 de la FSFE</h2>
        
-  </body>
+<p>Nuestra visión para el año 2048:</p>
+
+<figure>
+	<img src="https://pics.fsfe.org/uploads/medium/97/4f/5ed146cb41dcdf257f3648f8bfb7.jpg" alt="A slide showing the number 2048 in white. The blue background looks like it has the silhouette of an government building "/>
+		 </figure>
+
+<div>
+<ul>
+<li><strong>¡Todo el mundo tiene derecho a quitar e instalar cualquier software en cualquiera de sus dispositivos!</strong></li>
+
+<li><strong>¡Todos los fondos públicos para software deberían ser sólo para Software Libre!</strong> <br/> 
+Este principio ha estado en el centro de nuestros esfuerzos, y continuamos promoviéndolo a través de varias iniciativas bajo el lema «¿Dinero Público? Código público».</li>
+
+<li><strong>Todos los marcos regulatorios fomentan el uso y desarrollo del Software Libre.</strong> <br/> Queremos que los marcos normativos reconozcan esas contribuciones, incentivando a las empresas y organizaciones a desarrollar y utilizar Software Libre.</li>
+
+<li><strong>Las decisiones sobre licencias y asuntos legales se basan en hechos, en lugar de en el miedo, la incertidumbre y la duda. </strong> <br/>Los colaboradores del Software Libre deberían ser capaces de centrarse en contribuir a la sociedad sin preocuparse constantemente por cuestiones legales.</li>
+
+<li><strong>Los jóvenes tienen la oportunidad de trastear, experimentar 
+y programar con Software Libre, como estándar.</strong></li>
+</ul> </div>
+
+
+<p>Echa un vistazo a nuestros logros 
+más importantes en nuestras áreas de trabajo. <a 
+href="/about/timeline/index.html">Explora nuestra cronología</a>. </p>     
+   </body>
+    
+  
   <followup>join</followup>
 <translator/>
 </html>

fsfe.org/about/mission.fr.xhtml

@@ -27,7 +27,39 @@
     <li>encourage la population à utiliser et développer des Logiciels Libres.</li>
     <li>fournit des ressources pour permettre à tous de promouvoir les Logiciels Libres en Europe.</li>
     </ul>
+ 
+ 
+    
+  <h2>La vision 2048 de la FSFE</h2>
        
+
+<p>Notre vision pour l'année 2048 :</p>
+
+<figure>
+	<img src="https://pics.fsfe.org/uploads/medium/97/4f/5ed146cb41dcdf257f3648f8bfb7.jpg" alt="A slide showing the number 2048 in white. The blue background looks like it has the silhouette of an government building "/>
+		 </figure>
+
+<div> 
+	<ul> 
+<li><strong>Tout le monde a le droit de supprimer et d’installer 
+n’importe quel logiciel sur n’importe lequel de ses appareils 
+!</strong></li>
+
+<li><strong>Tous les financements publics pour les logiciels doivent 
+être réservés uniquement au logiciel libre !</strong> <br/> Ce principe 
+est au cœur de nos efforts, et nous continuons à le promouvoir à 
+travers diverses initiatives sous la devise "Public Money? Public 
+Code!".</li>
+
+ <li><strong>Tous les réglementaires encouragent l’utilisation et le développment du logiciel libre.</strong> <br/> Nous souhaitons également que les cadres réglementaires reconnaissent ces contributions en incitant les entreprises et les organisations à développer et utiliser des logiciels libres.</li>
+
+<li><strong> Les décisions juridiques et de licence sont basées sur des faits, et non sur la peur, l'incertitude et le doute.</strong> <br/>Les contributeurs au logiciel libre doivent pouvoir se concentrer sur leurs contributions à la société sans se soucier constamment de problèmes juridiques.</li>
+
+<li><strong>Les jeunes ont l'opportunité de bricoler, expérimenter et 
+coder avec des logiciels libres par défaut.</strong> </li>
+  </ul> </div>
+
+<p>Découvrez nos principales réalisations dans différents champs d'action. <a href="/about/timeline/index.html">Parcourez notre chronologie</a>. </p>   
   </body>
   <followup>join</followup>
 <translator/>

fsfe.org/about/mission.it.xhtml

@@ -30,10 +30,51 @@
       <li>incoraggia le persone ad usare e sviluppare Software Libero.</li>
       <li>fornisce risorse per consentire a chiunque di promuovere ulteriormente il Software Libero in Europa.</li>
     </ul>
+  
+ <h2>La visione 2048 della FSFE</h2>
+       
+<p>La nostra visione per l'anno 2048:</p>
+
+<figure>
+	<img src="https://pics.fsfe.org/uploads/medium/97/4f/5ed146cb41dcdf257f3648f8bfb7.jpg" alt="A slide showing the number 2048 in white. The blue background looks like it has the silhouette of an government building "/>
+		 </figure>
+<div> 
+	<ul> 
+<li><strong>Ognuno ha il diritto di rimuovere e installare qualsiasi software su ognuno dei 
+propri dispositivi!</strong></li>
+
+<li><strong>Tutti i finanziamenti pubblici per lo svlippo di software 
+sono esclusivamente per il Software Libero!</strong> <br/> Questo 
+principio è stato sempre al centro dei nostri sforzi, e continuiamo a 
+portarlo avanti attraverso varie iniziative sotto lo slogan "Denaro 
+pubblico? Codice pubblico!".</li>
+
+
+ <li><strong> Tutti i quadri normativi incoraggiano l'uso e lo sviluppo 
+ di Software Libero</strong>.<br/>  Vogliamo che i 
+ quadri normativi riconoscano questi contributi, incentivando le 
+ aziende e le organizzazioni a sviluppare e utilizzare il Software Libero. </li>
+
+<li><strong>Le decisioni legali e di licenza sono basate sui fatti 
+anziché sulla paura, incertezza e dubbio.</strong> <br/>Chi 
+contribuisce al Software Libero dovrebbe essere in grado di 
+focalizzarsi sul contributo da dare alla società, senza preoccuparsi 
+costantemente di questioni legali.</li>
+
+<li><strong>I giovani hanno la possibilità di smanettare, sperimentare 
+e scrivere codice con il Software Libero come opzione 
+predefinita.</strong></li>
+</ul> </div>
+
+       
+ <p>Scopri i nostri risultati
+più importanti nei nostri settori di attività.<a 
+href="/about/timeline/index.html">Explora nuestra cronología</a>. </p>  
+       
        
   </body>
   <followup>join</followup>
-  <translator>Stefano Fraccaro</translator>
+<translator/>
 </html><!--
 Local Variables: ***
 mode: xml ***

fsfe.org/about/summermeeting-schedule.en.xhtml

@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<html>
+  <version>1</version>
+
+  <head>
+    <title>FSFE 25 - Schedule</title>
+  </head>
+  <body class="overview">
+   <h1 class="heading">FSFE 25 - Schedule</h1>
+
+    <div id="introduction">
+      <img class="right" style="width: 200px;" src="https://pics.fsfe.org/uploads/original/c5/1f/4290dac645f0642eba47acd49b14.png" alt="Logo of 25th birthday of the FSFE" />
+      <p>
+		This year, the FSFE turns 25 and we will celebrate it. On 
+		18 and 19 July we will spend the weekend in Kraków 
+		filled with talks, networking, and plenty of fun. Below is the 
+		schedule of all the events taking place over that weekend.
+      </p>
+
+      <p><strong>The weekend talks are part of EuroPython 2026 Sprints, at Echo Miasta (Kapelanka 56, 30-347 Kraków)</strong></p>
+      <p><a href="https://download.fsfe.org/tools/fsfe25.ics">Add the FSFE talks in your calendar</a></p>  
+    </div>
+    
+    <h2>Friday 17 July</h2>
+
+    <table class="table table-responsive colored">
+          <tr>
+            <th class="header-cell">Time</th>
+            <th class="header-cell">Event</th>
+            <th class="header-cell">Speaker</th>
+          </tr>
+          <tr>
+            <td>13:55-14:25</td>
+            <td><a href="https://ep2026.europython.eu/session/a-vision-for-software-freedom-in-2048">A vision for software freedom in 2048</a> (talk part of the official programme of Europython 2026)</td>
+            <td>Matthias Kirschner</td>
+            </tr>
+          <tr>
+            <td>19:00</td>
+            <td>Warm-up Dinner at Veganic (Karmelicka 34, Krakow, PL 31-128 Kraków)*</td>
+            <td></td>
+          </tr>
+    </table>
+    <small>*Dinner will be "Everyone is responsible for their own expenses"</small>
+
+    <h2>Saturday 18 July</h2>
+    
+    <table class="table table-responsive colored">
+          <tr>
+            <th class="header-cell">Time</th>
+            <th class="header-cell">Session</th>
+            <th class="header-cell">Speaker</th>
+          </tr>
+          <tr>
+            <td>10:00-10:15</td>
+            <td>Welcome</td>
+            <td>Matthias</td>
+          </tr>
+          <tr>
+            <td>10:15-10:30</td>
+            <td>25 Years of the FSFE, 60 Years of Star Trek - To Boldly Share Where No One Has Shared Before</td>
+            <td>Florian</td>
+          </tr>
+          <tr>
+            <td>10:30-10:45</td>
+            <td>Memories from founding the FSFE</td>
+            <td>Bernhard</td>
+          </tr>
+          <tr>
+            <td>10:45-10:55</td>
+            <td>Thanking others at ilovefs</td>
+            <td>Bonnie</td>
+          </tr>
+          <tr>
+            <td>10:55-11:05</td>
+            <td>How a bunch of Python scripts handle FSFE's finances</td>
+            <td>Reinhard</td>
+          </tr>
+          <tr>
+            <td>11:05-11:15</td>
+            <td>From becoming contributor to do my first talk for the FSFE</td>
+            <td>Fiona</td>
+          </tr>
+          <tr>
+            <td>11:15-11:25</td>
+            <td>Running a NGO empowered with Software Freedom</td>
+            <td>Tobias</td>
+          </tr>
+          <tr>
+            <td>11:25-11:35</td>
+            <td>From Italian activities to setting up a legal entity</td>
+            <td>Marta</td>
+          </tr>
+          <tr class="row-highlight">
+            <td>11:35-11:55</td>
+            <td>Break</td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>11:50-12:00</td>
+            <td>Next steps for Public Money? Public Code!</td>
+            <td>Johannes</td>
+          </tr>
+          <tr>
+            <td>12:00-12:15</td>
+            <td>FSFE and SFC: Collaboration FTW</td>
+            <td>Karen</td>
+          </tr>
+          <tr>
+            <td>12:15-12:35</td>
+            <td>Why companies support the FSFE? Words from our donors</td>
+            <td>FSFE Donors / Sponsors</td>
+          </tr>
+          <tr class="row-highlight">
+            <td>12:35-14:00</td>
+            <td>Networking time (Lunch Break)</td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>14:00-14:10</td>
+            <td>Reaching new audiences – The “Vegan Approach”</td>
+            <td>Franz</td>
+          </tr>
+          <tr>
+            <td>14:10-14:20</td>
+            <td>Over 15 years of the Dutch Team</td>
+            <td>Maurice and Nico</td>
+          </tr>
+          <tr>
+            <td>14:20-14:35</td>
+            <td>Rediscovering the value of (software) freedom: experiences from Italian high schools </td>
+            <td>Emanuele and Lorenzo Lin</td>
+          </tr>
+          <tr>
+            <td>14:35-15:00</td>
+            <td>Award time – Highlighting FSFE contributors</td>
+            <td>Ana and Matthias</td>
+          </tr>
+          <tr>
+            <td>15:00-15:15</td>
+            <td>What software freedom means today</td>
+            <td>Karsten</td>
+          </tr>
+          <tr>
+            <td>15:15-16:15</td>
+            <td>Software Freedom Improtheater</td>
+            <td></td>
+          </tr>
+          <tr class="row-highlight">
+            <td>17:00-19:00</td>
+            <td>Dinner at Hamsa (Szeroka 2, 31-053 Kraków)*</td>
+            <td></td>
+          </tr>
+          <tr class="row-highlight">
+            <td>20:00</td>
+            <td>"The FSFE is turning 25!" - community meeting. At Stara Zajezdnia ( ul. Św. Wawrzyńca 12, 31-060 Kraków)</td>
+            <td></td>
+          </tr>     
+    </table>
+    <small>*Dinner will be "Everyone is responsible for their own expenses"</small>
+   
+    <h2>Sunday 19 July</h2>
+    
+    <table class="table table-responsive colored">
+          <tr>
+            <th class="header-cell">Time</th>
+            <th class="header-cell">Session</th>
+            <th class="header-cell">Speaker</th>
+          </tr>
+          <tr>
+            <td>10:00-10:15</td>
+            <td>How to get funding for your local group project</td>
+            <td>Patrick</td>
+          </tr>
+          <tr>
+            <td>10:15-10:25</td>
+            <td>Engaging with FSFE’s website, plans for the future</td>
+            <td>Darragh</td>
+          </tr>
+          <tr>
+            <td>10:25-10:35</td>
+            <td>Let’s dance - Teufel Mynd Analysis </td>
+            <td>Nicole</td>
+          </tr>
+          <tr>
+            <td>10:35-10:45</td>
+            <td>Refund 4 Freedom – Efforts to scale own efforts</td>
+            <td>Luca B.</td>
+          </tr>
+          <tr>
+            <td>10:45-11:15</td>
+            <td>Non-Free Software Licenses: Restrictions on the Freedom to Use - Fishbowl discussion</td>
+            <td>Gabriel and Bonnie</td>
+          </tr>
+          <tr class="row-highlight">
+            <td>11:15-11:35</td>
+            <td>Break</td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>11:35-11:50</td>
+            <td>DMA – Status Apple vs FSFE</td>
+            <td>Jithendra</td>
+          </tr>
+          <tr>
+            <td>11:50-12:00</td>
+            <td>Reverse Engineering in the Age of Artificial Intelligence</td>
+            <td>Anna Rita</td>
+          </tr>
+          <tr>
+            <td>12:00-12:10</td>
+            <td>Highlights from the Swiss team</td>
+            <td>Alex</td>
+          </tr>
+          <tr>
+            <td>12:10-12:20</td>
+            <td>Status and plans of the Polish Team</td>
+            <td>Damian</td>
+          </tr>
+          <tr>
+            <td>12:20-12:30</td>
+            <td>Ada &amp; Zangemann Automation Status and Future</td>
+            <td>Nico</td>
+          </tr>
+          <tr>
+            <td>12:30-12:40</td>
+            <td>From Winning YH4F to monitoring the Interoperable Europe Act</td>
+            <td>Sofia</td>
+          </tr>
+          <tr>
+            <td>12:40-12:50</td>
+            <td>Italian experiences engaging with the Young Generation</td>
+            <td>Giacomo</td>
+          </tr>
+          <tr>
+            <td>12:50-13:00</td>
+            <td>Closing</td>
+            <td>Matthias</td>
+          </tr>
+    </table>
+  </body>
+  
+<translator/>
+</html>
+

fsfe.org/about/timeline/index.en.xhtml

@@ -11,7 +11,7 @@
     <div id="introduction">
       <p>
         With the support of
-        <a href="/contribute/contribute.html">our supporters</a>, and
+        <a href="/contribute/contribute.html">our supporters</a> and
         <a href="/donate/thankgnus.html">our donors</a>, the FSFE has been
         <a href="/about/ourwork.html">promoting and defending</a> all aspects of
         software freedom in Europe since 2001. Take a look at our most important
@@ -20,14 +20,14 @@
       
       <div id="timeline">
 	  <p>
-		  In the timeline we differ between the FSFE's activity frames 
+		  In the timeline we distinguish between the FSFE's activity frames 
 		  <span class="span-device-neutrality">Device Neutrality</span>, 
 		  <span class="span-legal-education">Legal Education</span>, 
 		  <span class="span-market-regulations">Market 
 		  Regulations</span>, <span class="span-org-dev">Organisational 
 		  Development</span>, <span class="span-pmpc">Public Money? 
 		  Public Code!</span>, <span 
-		  class="span-volunteer-engagement">Volunteer Engagement</span> 
+		  class="span-volunteer-engagement">Volunteer Engagement</span>, 
 		  and <span class="span-young-generation">Young 
 		  Generation</span>.
         </p>

fsfe.org/about/timeline/index.es.xhtml

@@ -3,29 +3,40 @@
   <version>3</version>
 
   <head>
-    <title>Cronología de la FSFE: trabajando en favor del software libre desde 2001</title>
+    <title>Cronología de la FSFE: trabajando  por el software libre desde 2001</title>
   </head>
-  <body>
-    <h1>Cronología de la FSFE: trabajando en favor del software libre desde 20011</h1>
+  <body class="overview">
+    <h1>Cronología de la FSFE: trabajando por el Software Libre desde 2001</h1>
 
     <div id="introduction">
-	  <p> Gracias al apoyo de <a href="/contribute/contribute.html">nuestros colaboradores</a>, y 
-	  de <a href="/donate/thankgnus.html">nuestros donantes corporativos</a>, la FSFE lleva desde 2001 <a href="/about/ourwork.html">promoviendo y defendiendo</a> todos 
-	  los aspectos de la libertad del software en Europa. Descubre 
-	  nuestros logros más importantes en distintos ámbitos a través de 
-	  nuestra cronología. </p>
+      <p>
+		Gracias al apoyo de <a 
+		href="/contribute/contribute.html">nuestros colaboradores</a> 
+		y de <a href="/donate/thankgnus.html">nuestros donantes</a>, la 
+		FSFE lleva <a href="/about/ourwork.html">promoviendo y 
+		defendiendo</a> la libertad del software, en todos sus aspectos, 
+		en Europa desde 2001. Echa un vistazo a nuestros logros más 
+		importantes, dentro de nuestros distintos ámbitos de trabajo, en nuestra cronología.
+      </p>
+      
+      <div id="timeline">
+	  <p>
+		  En la cronología distinguimos entre los distintos ámbitos de 
+		  actividad de la FSFE: <span 
+		  class="span-device-neutrality">Neutralidad de los 
+		  Dispositivos</span>, <span 
+		  class="span-legal-education">Educación legal</span>, <span 
+		  class="span-market-regulations">Regulación de los 
+		  mercados</span>, <span class="span-org-dev">Desarrollo 
+		  organizativo</span>, <span class="span-pmpc">¿Dinero Público? 
+		  ¡Código Público!</span>, <span 
+		  class="span-volunteer-engagement">Voluntariado</span> y <span class="span-young-generation"> 
+		  Generaciones jóvenes</span>.
+        </p>
+	  </div>
     </div>
 
-	<p> En la línea temporal distinguimos entre los ámbitos de 
-	actividad de la FSFE: «Neutralidad del Dispositivo» ♺, 
-	«Educación jurídica» ⚖, «Regulación del mercado» 🗳 , 
-	«¿Dinero público? ¡Código público!» 🏛, «Participación de 
-	voluntarios» 📣, «Generaciones jóvenes» 👾, además de 
-	«Desarrollo organizativo» 🤝. </p>
-	
-	
     <timeline/>
   </body>
-<translator/>
+  <translator/>
 </html>
-

fsfe.org/activities/ada-zangemann/about.en.xhtml

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<html>
+<version>1</version>
+
+<head>
+  <title>Ada &amp; Zangemann - A Tale of Software, Skateboards, and Raspberry Ice Cream - About the Book</title>
+</head>
+
+<body class="article">
+
+  <h1 class="p-name">About the Book</h1>
+
+	<figure>
+		<img src="https://pics.fsfe.org/uploads/medium/94/f4/aec90b9dfe2e0f5073003fca5d05.png" alt=""/>
+		<figcaption>
+		Illustration from the book
+		</figcaption>  
+	</figure>
+	
+  <h2 id="story">The Story</h2>
+	
+	<p>The illustrated book "Ada &amp; Zangemann - A Tale of Software, 
+	Skateboards and Raspberry Ice Cream" tells the story of the famous 
+	inventor Zangemann and the girl Ada, a curious tinkerer. Ada begins 
+	to experiment with hardware and software, and in the process 
+	realises how crucial it is for her and others to control 
+	technology. Here is a short summary:</p>
+	
+	<blockquote>
+	<p>The famous inventor Zangemann lives in a huge villa 
+	high above the city. Adults and children alike love his inventions 
+	and are desperate to have them. But then something happens: when 
+	Zangemann wants to take another close-up look at his inventions 
+	during a walk through the city, a child hits him in the shin with 
+	the skateboard. That hurts! Enraged, the inventor makes a momentous 
+	decision... The clever girl Ada sees through what is going on. 
+	Together with her friends, she forges a plan.</p>
+	</blockquote>
+	
+	<p>A book that arouses children's interest in tinkering and 
+	encourages them to shape technology. From age 6 to 106.</p>
+	
+  <h2 id="editions">Editions &amp; Languages</h2>
+
+	<p>The following list shows the languages in which the book is 
+	currently available and the publishers under which it is 
+	published.</p>
+	
+	<book-languages />
+
+	<figure>
+		<img src="https://pics.fsfe.org/uploads/medium/3e/34/d983774aecccb9b950910c6d54d8.jpg" alt="The cover of the book by Ada and Zangemann, repeated six times, with the variation that the book's title, Ada &amp; Zangemann - A Tale of Software, Skateboards, and Raspberry Ice Cream, is written in different languages."/>
+		<figcaption>
+		The book in different languages
+		</figcaption>  
+	</figure>
+
+  <h2 id="author">Author &amp; Illustrator</h2>
+  
+  <p><a href="https://k7r.eu">Matthias Kirschner</a> is the author of 
+  the book and president of the FSFE. Matthias was fascinated by 
+  computers and software as a child. He had an early internet 
+  connection, through which he learned a lot. Children have the right 
+  to take their future into their own hands, and Matthias is committed 
+  to the goal that all humans can use software in a self-determined 
+  way. He also wants to build an electric skateboard with Free 
+  Software.</p>
+  
+  <p><a href="http://sandra-brandstaetter.com/">Sandra Brandstätter</a> 
+  is the book’s illustrator. Sandra has always liked crafting with 
+  scissors, pliers, glue, wire, fabric, and paper. Today she works as 
+  an illustrator, comics author and character designer for animated 
+  films and series, such as the German public television series ‘Trudes 
+  Tier’. If she could choose from an ice cream machine, Sandra would 
+  pick a creamy rainbow ice cream with lemon-cucumber flavour and a lot 
+  of sprinkles.</p>
+  
+  <h2 id="build">Build your Own Version</h2>
+  
+  <p>
+  Our tool chain automatically builds <a 
+  href="https://download.fsfe.org/ada-zangemann/generated/">different 
+  formats of the book</a> from the <a 
+  href="https://hosted.weblate.org/projects/fsfe/ada-zangemann/">translations 
+  on Weblate</a>. For example, <a 
+  href="https://download.fsfe.org/ada-zangemann/generated/Ada_Zangemann-screen.en.mediumres.pdf">screen-readable 
+  PDFs</a> or <a 
+  href="https://download.fsfe.org/ada-zangemann/generated/Ada_Zangemann.en.brf">Braille 
+  versions of the book</a>. Due to the license, you can <a 
+  href="/activities/ada-zangemann/involved.html#adapt">make 
+  modifications yourself and build own version</a>.
+  </p>
+
+</body>
+
+<followup>subscribe-nl</followup>
+
+<sidebar promo="our-work">
+  <h3><a href="/activities/ada-zangemann/">Overview</a></h3>
+  <h3>About the Book</h3>
+  <ul>
+    <li><a href="#story">The Story</a></li>
+    <li><a href="#editions">Editions &amp; Languages</a></li>
+    <li><a href="#author">Author &amp; Illustrator</a></li>
+    <li><a href="#build">Build your Own Version</a></li>
+  </ul>
+  <h3><a href="/activities/ada-zangemann/movie.html">The Movie</a></h3>
+  <h3><a href="/activities/ada-zangemann/resources.html">Resources</a></h3>
+  <h3><a href="/activities/ada-zangemann/involved.html">Get Involved</a></h3>
+  <h3><a href="/activities/ada-zangemann/events.html">Events</a></h3>
+  <h3><a href="/activities/ada-zangemann/book-reviews.html">Reviews</a></h3>
+</sidebar>
+<translator/>
+</html>

fsfe.org/activities/ada-zangemann/about.sources

@@ -0,0 +1 @@
+fsfe.org/activities/ada-zangemann/data/language/book/*:[]

fsfe.org/activities/ada-zangemann/about.xsl

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:import href="../../fsfe.xsl"/>
+  <!-- ==================================================================== -->
+  <!-- Dynamic list of languages for the book                                              -->
+  <!-- ==================================================================== -->
+  <xsl:template match="book-languages">
+    <xsl:for-each select="/buildinfo/document/set/language">
+		<xsl:sort select="@value" order="ascending"/>
+		<xsl:variable name="language" select="@value"/>
+			<p>
+              <xsl:value-of select="$language"/>
+            </p>
+            <ul>
+			  <xsl:for-each select="publisher">
+				<li>
+					<p>
+						<xsl:call-template name="gettext">
+							<xsl:with-param name="id" select="'publisher'" />
+						</xsl:call-template>
+					<xsl:text>: </xsl:text>
+					<a>
+						<xsl:attribute name="href">
+							<xsl:value-of select="url"/>
+						</xsl:attribute>
+						<xsl:value-of select="name"/>
+					</a>
+					</p>
+					<p>
+						ISBN: <xsl:value-of select="number"/>
+					</p>
+					<xsl:if test="affiliate != ''">
+						<p><em>
+							<xsl:value-of select="affiliate"/>
+						</em></p>
+					</xsl:if>
+				</li>
+			  </xsl:for-each>
+			</ul>
+    </xsl:for-each>
+  </xsl:template>
+</xsl:stylesheet>

fsfe.org/activities/ada-zangemann/book-reviews.en.xhtml

@@ -1,65 +1,110 @@
 <?xml version="1.0" encoding="utf-8"?>
 <html>
-<version>6</version>
+<version>7</version>
 
 <head>
-  <title>Ada &amp; Zangemann book reviews</title>
+  <title>Ada &amp; Zangemann - A Tale of Software, Skateboards, and Raspberry Ice Cream - Reviews &amp; Press</title>
 </head>
 
 <body class="article">
 
- <h1 class="p-name">What do readers say about Ada &amp; Zangemann?</h1>
+<h1 class="p-name">Reviews</h1>
+ 
+	<figure>
+		<img src="https://pics.fsfe.org/uploads/medium/54/e9/50126f9b948b901102ef2defec86.png" alt=""/>
+		<figcaption>
+		Illustration from the book
+		</figcaption>  
+	</figure>
+	
+  <h2 id="selected">Selected Quotes</h2>
+  
+  <blockquote>
+  <p>"A rousing tale of self-reliance, community, and standing up
+  to bullies." - <em>Cory Doctorow, Sci-Fi
+  Author</em></p>
 
-<p>  
-  Tech media and interested individuals have shared their reviews about <a href="/activities/ada-zangemann">Ada
-  &amp; Zangemann - A Tale of Software, Skateboards, and Raspberry Ice Cream</a>.
-</p>
+  <p>"Introduces readers young and old to the power and peril of
+  software." - <em>Vint Cerf, Computer Scientist and One
+  of the Inventors of the Internet</em></p>
 
-<figure>
-  <img src="https://pics.fsfe.org/uploads/medium/88/0e/538ea879b557fc6b32b07e243a8a.jpg" alt="A teacher standing in a classroom holding the book, with all the pupils holding the book in front of their heads."/>
-  <figcaption>
-    Ada and Zangemann reading in a French school. 
-  </figcaption>
-</figure>
+  <p>"The book is a motivation for the first demo and a little bit
+  of civil disobedience.  It is a utopia of possibilities to make the world
+  better with limited means and little money, and an example without moralistic
+  finger-pointing, that control does not make happy." - <em>Anna Biselli,
+  Editor-in-Chief Netzpolitik.org</em></p>
 
-<dynamic-content/>
+  <p>"Even as a non-child, I was captivated by the story from the
+  first page to the last. Kudos to the author for packaging difficult topics
+  such as monopolies, lobbyism, digital divide, software freedom, digital
+  autonomy, IoT, consumer control, e-waste and much more in a child-friendly
+  form in an easily understandable and exciting storyline." - <em>Jörg Luther,
+  chief editor of the German Linux-Magazin, LinuxUser, Raspberry Pi Geek</em>
+  </p>
 
-<figure>
-  <peertube url="https://media.fsfe.org/w/opzZJm8SAYLQYz5gTXBeJ9"/>
-  <figcaption>
-    On 4 December 2023, the French Minister of Education, Gabriel Attal, presented the book “Ada &amp; Zangemann” to the APFA parliamentarians meeting in the old Bonn parliament.
-    Afterwards he gifted the book to Anke Rehlinger, Minister-President of the Saarland (Germany).
-  </figcaption>
-</figure>
+  <p>“What a fun read! I recognize myself in Ada at many moments.” - 
+  <em>Isabela Fernandes, Executive Director, The Tor project</em></p>
+ 
+  <p>“I love this book and I love that it can be shared and translated and adapted easily because licensed freely under a Creative Commons license (BY-SA).” - 
+  <em>Lawrence Lessig, Founder of Creative Commons</em></p>
+  </blockquote>
+  
+  <figure>
+      <img src="https://pics.fsfe.org/uploads/medium/624801358184dc7876117b818a8b6b83.png" alt="open book with night scene"/>
+      <figcaption>
+			A page of the book
+		</figcaption>
+  </figure>
+  
+  <blockquote>
+  <p>“Ada &amp; Zangemann brings a highly topical, technically relevant 
+  subject to children.” - <em>Catharina Maracke, Chair of the Board, 
+  Open Source Initiative</em></p>
+
+  <p>“Software freedom is a critical component to having technology 
+  that we can rely on as a society, and it never is too early to learn 
+  about why it is so important. I can't wait to read this book to 
+  my kids!” - <em>Karen Sandler, Executive Director, Software Freedom 
+  Conservancy</em></p>
+
+  <p>“In this hopeful story Ada and her friends join a movement that 
+  started back in 1983. Their courageous adventure of software freedom 
+  and learning how technology works is a wonderful way to introduce 
+  young people everywhere to the joys of tinkering!” - <em>Zoë Kooyman, 
+  Executive Director, Free Software Foundation</em></p>
+	</blockquote>
+
+  <h2 id="reviews">Full Reviews</h2>
+
+	<p>  
+	Tech media and interested individuals have shared their reviews about <a href="/activities/ada-zangemann">Ada
+	&amp; Zangemann - A Tale of Software, Skateboards, and Raspberry Ice Cream</a>.
+	</p>
+
+	<figure>
+		<img src="https://pics.fsfe.org/uploads/medium/d6/0c/ca2e9df2e1c9d4a03e4b9f1b42a1.jpg" alt="Childrens holding the book in front of their heads."/>
+		<figcaption>
+			Ada and Zangemann reading in a italian school
+		</figcaption>
+	</figure>
+
+	<dynamic-content/>
 
 </body>
 
-<sidebar promo="our-work">
-  <h3>About the book</h3>
-  <ul>
-    <li><a href="/activities/ada-zangemann/index.html">Overview</a></li>
-    <li><a href="/activities/ada-zangemann/letters.html">Letters to Zangemann</a></li>
-    <li><a href="/activities/ada-zangemann/movie.html">Movie</a></li>
-    <li><a href="/activities/ada-zangemann/drawings.html">Drawings</a></li>
-  </ul>
-  <h3>Publishers</h3>
-  <ul>
-    <li><a href="https://nostarch.com/ada-zangemann">No Starch Press</a> (English book)</li>
-    <li><a href="https://dpunkt.de/produkt/ada-und-zangemann/?ref=10022">O'Reilly</a> (German book)</li>
-    <li><a href="https://cfeditions.com/ada/">C&amp;F éditions</a> (French book)</li>
-    <li><a href="https://streetlib.co/isbn-9791222461823">Distributor StreetLib</a> (Italian book)</li>
-    <li><a href="https://modspil.dk/">Modspil</a> (Danish book)</li>
-  </ul>
-  <h3>Resources</h3>
-  <ul>
-    <li><a href="https://git.fsfe.org/FSFE/ada-zangemann">Additional Materials / Git Repository</a></li>
-    <li><a href="https://git.fsfe.org/FSFE/ada-zangemann/src/branch/main/Presentations">Reading presentations</a></li>
-    <li><a href="https://sharepic.fsfe.org/#ada">Sharepic generator</a></li>
-    <li><a href="/contribute/spreadtheword#childrensbook">Order materials</a></li>
-  </ul>
+<followup>subscribe-nl</followup>
 
+<sidebar promo="our-work">
+  <h3><a href="/activities/ada-zangemann/">Overview</a></h3>
+  <h3><a href="/activities/ada-zangemann/about.html">About the Book</a></h3>
+  <h3><a href="/activities/ada-zangemann/movie.html">The Movie</a></h3>
+  <h3><a href="/activities/ada-zangemann/resources.html">Resources</a></h3>
+  <h3><a href="/activities/ada-zangemann/involved.html">Get Involved</a></h3>
+  <h3><a href="/activities/ada-zangemann/events.html">Events</a></h3>
+  <h3>Reviews</h3>
   <ul>
-    <li><a href="/activities/ada-zangemann/index.html#id-get-active">Get Active</a></li>
+    <li><a href="#selected">Selected Quotes</a></li>
+    <li><a href="#reviews">Full Reviews</a></li>
   </ul>
 </sidebar>
 

fsfe.org/activities/ada-zangemann/data/language/book/danish.en.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed>
+  <version>1</version>
+
+	<language value="Danish">
+		<publisher>
+			<url>https://modspil.dk/</url>
+			<name>Modspil</name>
+			<number>978-1-7185-0318-2</number>
+			<affiliate />
+		</publisher>
+	</language>
+</feed>
+

fsfe.org/activities/ada-zangemann/data/language/book/english.en.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed>
+  <version>1</version>
+
+	<language value="English">
+		<publisher>
+			<url>https://nostarch.com/ada-zangemann</url>
+			<name>No Starch Press</name>
+			<number>978-1-718-50320-5</number>
+			<affiliate />
+		</publisher>
+	</language>
+</feed>
+

fsfe.org/activities/ada-zangemann/data/language/book/french.en.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed>
+  <version>1</version>
+
+	<language value="French">
+		<publisher>
+			<url>https://cfeditions.com/ada/</url>
+			<name>C&amp;F éditions</name>
+			<number>978-2-37662-075-4</number>
+			<affiliate />
+		</publisher>
+	</language>
+</feed>

fsfe.org/activities/ada-zangemann/data/language/book/german.en.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed>
+  <version>1</version>
+
+	<language value="German">
+		<publisher>
+			<url>https://dpunkt.de/produkt/ada-und-zangemann/?ref=10022</url>
+			<name>O'Reilly Germany / Dpunkt Verlag</name>
+			<number>978-3-96009-190-5</number>
+			<description>With 
+			O'Reilly Germany / Dpunkt Verlag, the FSFE has an affiliate link and 
+			gets 12%.</description>
+			<affiliate>With O'Reilly Germany / Dpunkt Verlag, the FSFE has an affiliate link and gets 12%.</affiliate>
+		</publisher>
+	</language>
+</feed>
+

fsfe.org/activities/ada-zangemann/data/language/book/italian.en.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed>
+  <version>1</version>
+
+	<language value="Italian">
+		<publisher>
+			<url>https://store.streetlib.com/products.php?productId=537977</url>
+			<name>StreetLib</name>
+			<number>979-12-224-6182-3</number>
+			<affiliate>With StreetLib, the FSFE has an affiliate link and gets 42% for the paper book and 72% for the eBook.</affiliate>
+		</publisher>
+		<publisher>
+			<url>https://www.lulu.com/shop/matthias-kirschner-and-sandra-brandst%C3%A4tter-and-luca-bonissi/ada-zangemann-una-fiaba-che-parla-di-software-skateboard-e-gelato-al-lampone/hardcover/product-2m2gvqw.html</url>
+			<name>Lulu.com</name>
+			<number>979-12-224-6182-3</number>
+		</publisher>
+	</language>
+</feed>
+

fsfe.org/activities/ada-zangemann/data/language/book/norwegian.en.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed>
+  <version>1</version>
+
+	<language value="Norwegian">
+		<publisher>
+			<url>https://www.lulu.com/shop/sandra-brandst%C3%A4tter-and-matthias-kirschner-and-petter-reinholdtsen-and-henrik-g-sund/ada-og-zangemann/paperback/product-zmr289r.html</url>
+			<name>Lulu.com</name>
+			<number>978-8-293-82824-2</number>
+			<affiliate />
+		</publisher>
+	</language>
+</feed>

fsfe.org/activities/ada-zangemann/data/language/movie/danish.en.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed>
+  <version>1</version>
+
+	<language value="Danish">
+		<platform>
+			<url>https://media.fsfe.org/w/7S9bNkf36e7vBnBrBhj7vS</url>
+			<name>FSFE Peertube</name>
+		</platform>
+	</language>
+
+</feed>
+

fsfe.org/activities/ada-zangemann/data/language/movie/english.en.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed>
+  <version>1</version>
+
+	<language value="English">
+		<platform>
+			<url>https://media.fsfe.org/w/j1c6LQVZ8qnCLLwpXMuw3M</url>
+			<name>FSFE Peertube</name>
+		</platform>
+		<platform>
+			<url>https://commons.wikimedia.org/wiki/File:Ada_%26_Zangemann_-_A_Tale_of_Software,_Skateboards,_and_Raspberry_Ice_Cream.webm</url>
+			<name>Wikimedia</name>
+		</platform>
+		<platform>
+			<url>https://youtu.be/ac3ZZ7WUuZM</url>
+			<name>Youtube</name>
+		</platform>
+	</language>
+
+</feed>
+

fsfe.org/activities/ada-zangemann/data/language/movie/french.en.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed>
+  <version>1</version>
+
+	<language value="French">
+		<platform>
+			<url>https://media.fsfe.org/w/jPLeR3vpYE7zWaTYdsB9JU</url>
+			<name>FSFE Peertube</name>
+		</platform>
+		<platform>
+			<url>https://commons.wikimedia.org/wiki/File:Ada-zangemann-un-conte-sur-les-logiciels-le-skateboard-et-la-glace-%C3%A0-la-framboise.webm</url>
+			<name>Wikimedia</name>
+		</platform>
+		<platform>
+			<url>https://youtu.be/ms5vjV4IfoA</url>
+			<name>Youtube</name>
+		</platform>
+	</language>
+
+</feed>
+

fsfe.org/activities/ada-zangemann/data/language/movie/german.en.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed>
+  <version>1</version>
+
+	<language value="German">
+		<platform>
+			<url>https://media.fsfe.org/w/aw4EHJYVBSQGHPS22xXBG2</url>
+			<name>FSFE Peertube</name>
+		</platform>
+		<platform>
+			<url>https://commons.wikimedia.org/wiki/File:Ada-zangemann-ein-maerchen-ueber-software-skateboards-und-himbeereis.webm</url>
+			<name>Wikimedia</name>
+		</platform>
+		<platform>
+			<url>https://youtu.be/mxI3FWk7wec</url>
+			<name>Youtube</name>
+		</platform>
+	</language>
+
+</feed>
+

fsfe.org/activities/ada-zangemann/data/language/movie/italian.en.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed>
+  <version>1</version>
+
+	<language value="Italian">
+		<platform>
+			<url>https://media.fsfe.org/w/truAn16kstE9qiv6sKJGDt</url>
+			<name>FSFE Peertube</name>
+		</platform>
+	</language>
+
+</feed>
+

fsfe.org/activities/ada-zangemann/data/language/movie/spanish.en.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed>
+  <version>1</version>
+
+	<language value="Spanish">
+		<platform>
+			<url>https://media.fsfe.org/w/mPiL4nzoJ21gWiG4JHLATf</url>
+			<name>FSFE Peertube</name>
+		</platform>
+		<platform>
+			<url>https://commons.wikimedia.org/wiki/File:Ada-zangemann-un-cuento-sobre-software-monopatines-y-helado-de-frambuesa.webm</url>
+			<name>Wikimedia</name>
+		</platform>
+		<platform>
+			<url>https://youtu.be/xK2vVRR2iPc</url>
+			<name>Youtube</name>
+		</platform>
+	</language>
+
+</feed>
+

fsfe.org/activities/ada-zangemann/data/reviews/d250-jtfsm.en.xml

@@ -2,7 +2,7 @@
 <feed>
   <version>1</version>
 
-  <divider id="jtfsm" image="https://pics.fsfe.org/uploads/medium/10/46/b8108b5ebde36b3082da32884770.jpg" alt="Illustration of diverse crowd protesting. Protesters shout cheerfully and hold icecream cones. Slogans write: Do your homework mr President and we will do ours - Hacking 4 Freedom - Don't wreck our tech - There is no code B - They are young and need the code. A robot, two birds, and three dogs accompany the protest.">
+  <divider id="jtfsm" image="https://pics.fsfe.org/uploads/medium/c8/42/61c6e99d3d29d4da9c727b6ec0a6.jpg" alt="Illustration of diverse crowd protesting. Protesters shout cheerfully and hold icecream cones. Slogans write: Do your homework mr President and we will do ours - Hacking 4 Freedom - Don't wreck our tech - There is no code B - They are young and need the code. A robot, two birds, and three dogs accompany the protest.">
     <text>
       Illustration from the book.  <a href="/contribute/spreadtheword#jtsfm-poster">Get a poster or a postcard with the illustration at no cost.</a>
     </text>

fsfe.org/activities/ada-zangemann/data/reviews/d250-jtfsm.nl.xml

@@ -2,7 +2,7 @@
 <feed>
   <version>1</version>
 
-  <divider id="jtfsm" image="https://pics.fsfe.org/uploads/medium/10/46/b8108b5ebde36b3082da32884770.jpg" alt="Illustratie van een diverse groep die protesteert. Protestanten schreeuwen vrolijk en houden ijshoorntjes vast. Slogans zijn te lezen: Doe je huiswerk meneer President en wij doen het onze - Hacking 4 Freedom - Vernietig onze technologie niet - Er is geen code B - Ze zijn jong en hebben de code nodig. Een robot, twee vogels en drie honden begeleiden het protest.">
+  <divider id="jtfsm" image="https://pics.fsfe.org/uploads/medium/c8/42/61c6e99d3d29d4da9c727b6ec0a6.jpg" alt="Illustratie van een diverse groep die protesteert. Protestanten schreeuwen vrolijk en houden ijshoorntjes vast. Slogans zijn te lezen: Doe je huiswerk meneer President en wij doen het onze - Hacking 4 Freedom - Vernietig onze technologie niet - Er is geen code B - Ze zijn jong en hebben de code nodig. Een robot, twee vogels en drie honden begeleiden het protest.">
     <text>
       Illustration uit het boek. <a href="/contribute/spreadtheword#jtsfm-poster">Krijg kostenloos een poster of ansichtkaart met de illustraties.</a>
     </text>

fsfe.org/activities/ada-zangemann/events.en.xhtml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<html>
+<version>1</version>
+
+<head>
+  <title>Ada &amp; Zangemann - A Tale of Software, Skateboards, and Raspberry Ice Cream - Events &amp; Readings</title>
+</head>
+
+<body class="article">
+
+  <h1 class="p-name">Events</h1>
+
+	<figure>
+		<img src="https://pics.fsfe.org/uploads/medium/7e/b6/350e5a434d4ae21021280f3f1bda.png" alt=""/>
+		<figcaption>
+		Illustration from the book
+		</figcaption>  
+	</figure>
+
+    <h2 id="upcoming">Upcoming Events</h2>
+    <dynamic-content-events/>
+
+    <h2 id="past">Past Events (Archive)</h2>
+    <dynamic-content-events-archive/>
+
+</body>
+
+<followup>subscribe-nl</followup>
+
+<sidebar promo="our-work">
+  <h3><a href="/activities/ada-zangemann/">Overview</a></h3>
+  <h3><a href="/activities/ada-zangemann/about.html">About the Book</a></h3>
+  <h3><a href="/activities/ada-zangemann/movie.html">The Movie</a></h3>
+  <h3><a href="/activities/ada-zangemann/resources.html">Resources</a></h3>
+  <h3><a href="/activities/ada-zangemann/involved.html">Get Involved</a></h3>
+  <h3>Events</h3>
+  <ul>
+    <li><a href="#upcoming">Upcoming Events</a></li>
+    <li><a href="#past">Past Events (Archive)</a></li>
+  </ul>
+  <h3><a href="/activities/ada-zangemann/book-reviews.html">Reviews</a></h3>
+</sidebar>
+<translator/>
+</html>

fsfe.org/activities/ada-zangemann/events.sources

@@ -0,0 +1,2 @@
+fsfe.org/events/*/*:[ada-zangemann]
+fsfe.org/events/*/.*:[ada-zangemann]

fsfe.org/activities/ada-zangemann/events.xsl

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:import href="../../fsfe.xsl"/>
+  <!-- ==================================================================== -->
+  <!-- Dynamic upcoming list of events                                               -->
+  <!-- ==================================================================== -->
+	<xsl:template match="dynamic-content-events">
+	  <xsl:choose>
+		<xsl:when test="/buildinfo/document/set/event[         translate (substring(@end,1,10), '-', '') &gt;= translate (/buildinfo/@date, '-', '')       ]">
+		  <xsl:for-each select="/buildinfo/document/set/event[         translate (substring(@end,1,10), '-', '') &gt;= translate (/buildinfo/@date, '-', '')       ]">
+			<xsl:sort select="@start"/>
+			<xsl:element name="div">
+			  <!-- Description -->
+			  <xsl:element name="p">
+				<xsl:attribute name="class">text</xsl:attribute>
+				<xsl:element name="a">
+				  <xsl:attribute name="href">
+					<xsl:text>/events/index.html#</xsl:text>
+					<xsl:value-of select="@filename"/>
+				  </xsl:attribute>
+				  <xsl:value-of select="title"/>
+				</xsl:element>
+				<xsl:element name="br"/>
+				<!-- Date -->
+				<xsl:element name="span">
+				  <xsl:attribute name="class">date</xsl:attribute>
+				  <xsl:call-template name="event-date"/>
+				</xsl:element>
+				<!-- p/date -->
+			  </xsl:element>
+			  <!-- p -->
+			</xsl:element>
+			<!-- div/text -->
+		  </xsl:for-each>
+		</xsl:when>
+		<xsl:otherwise>
+		  <xsl:element name="p">
+			<xsl:call-template name="gettext">
+			  <xsl:with-param name="id" select="'no-upcoming-events'"/>
+			</xsl:call-template>
+		  </xsl:element>
+		</xsl:otherwise>
+	  </xsl:choose>
+	</xsl:template>
+  <!-- ==================================================================== -->
+  <!-- Dynamic past list of events                                               -->
+  <!-- ==================================================================== -->
+  <xsl:template match="dynamic-content-events-archive">
+    <xsl:for-each select="/buildinfo/document/set/event[         translate (substring(@end,1,10), '-', '') &lt;= translate (/buildinfo/@date, '-', '')       ]">
+      <xsl:sort select="@start" order="descending"/>
+        <xsl:element name="div">
+          <!-- Description -->
+          <xsl:element name="p">
+            <xsl:attribute name="class">text</xsl:attribute>
+            <xsl:element name="a">
+              <xsl:attribute name="href">
+                <xsl:text>/events/index.html#</xsl:text>
+                <xsl:value-of select="@filename"/>
+              </xsl:attribute>
+              <xsl:value-of select="title"/>
+            </xsl:element>
+            <xsl:element name="br"/>
+            <!-- Date -->
+            <xsl:element name="span">
+              <xsl:attribute name="class">date</xsl:attribute>
+              <xsl:call-template name="event-date"/>
+            </xsl:element>
+            <!-- p/date -->
+          </xsl:element>
+          <!-- p -->
+        </xsl:element>
+        <!-- div/text -->
+    </xsl:for-each>
+  </xsl:template>
+</xsl:stylesheet>

fsfe.org/activities/ada-zangemann/index.en.xhtml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <html>
-<version>11</version>
+<version>12</version>
 
 <!-- For translators: This is work in progress, there might be several updates -->
 
@@ -8,272 +8,105 @@
   <title>Ada &amp; Zangemann - A Tale of Software, Skateboards, and Raspberry Ice Cream</title>
 </head>
 
-<body class="article">
+<body class="landing">
 
-  <h1 class="p-name">Ada &amp; Zangemann - A Tale of Software, Skateboards, and Raspberry Ice Cream</h1>
+  <h1>Ada &amp; Zangemann - A Tale of Software, Skateboards, and Raspberry Ice Cream</h1>
 
-  <p>Here you find additional information and resources about the book "Ada
-  &amp; Zangemann - A Tale of Software, Skateboards, and Raspberry Ice Cream"
-  by <a href="https://k7r.eu">Matthias Kirschner</a> and <a href="http://sandra-brandstaetter.com/">Sandra Brandstätter</a>.</p>
+  <p> The illustrated book "Ada &amp; Zangemann - A Tale 
+  of Software, Skateboards, and Raspberry Ice Cream" by <a 
+  href="https://k7r.eu">Matthias Kirschner</a> and <a 
+  href="http://sandra-brandstaetter.com/">Sandra Brandstätter</a> tells 
+  the story of the famous inventor Zangemann and the girl Ada, a 
+  curious tinkerer. Ada begins to experiment with hardware and 
+  software, and in the process realises how crucial it is for her and 
+  others to control technology. Here you can find additional information 
+  and resources about the book and the movie.</p>
 
-  <figure>
-    <a href="https://pics.fsfe.org/uploads/medium/94/f4/aec90b9dfe2e0f5073003fca5d05.png">
-    <img src="https://pics.fsfe.org/uploads/medium/94/f4/aec90b9dfe2e0f5073003fca5d05.png" alt="A three way power adaptor, a tin of paint, a pair of pliers, a mouse,  a soldering iron, a phone, and a keyboard form a circle with a thin white curly line. Inside the circle, Ada and Zangemann face each other. Zangemann is an old man with glasses and Ada is a young girl with curly black hair."/></a>
-  </figure>
-
-  <h2>About the book</h2>
-
-  <blockquote><p>The famous inventor Zangemann lives in a huge villa high above
-  the city. Adults and children alike love his inventions and are desperate to
-  have them. But then something happens: when Zangemann wants to take another
-  close-up look at his inventions during a walk through the city, a child hits
-  him in the shin with the skateboard. That hurts! Enraged, the inventor makes
-  a momentous decision... The clever girl Ada sees through what is going on.
-  Together with her friends, she forges a plan.</p>
-
-  <p>This illustrated book tells the story of the famous inventor Zangemann and
-  the girl Ada, a curious tinkerer. Ada begins to experiment with hardware and
-  software, and in the process realises how crucial it is for her and others to
-  control technology.</p>
-
-  <p>A book that arouses children's interest in tinkering and encourages
-  shaping technology. From age 6 to 106.</p></blockquote>
-
-  <p>The book is currently available:</p>
-
-  <ul>
-
-    <li><a href="https://nostarch.com/ada-zangemann">in English by the
-    publisher No Starch Press</a> and can be ordered from your preferred book
-    store world-wide with the ISBN 978-1-718-50320-5.</li>
-
-    <li><a href="https://dpunkt.de/produkt/ada-und-zangemann/?ref=10022">in
-    German by the publisher O'Reilly Germany / Dpunkt Verlag (affiliate link -
-    the FSFE gets 12%)</a> and can be ordered from your preferred book store
-    with the ISBN 978-3-96009-190-5.</li>
-
-    <li><a href="https://cfeditions.com/ada">in
-    French by the publisher C&amp;F éditions</a> and can be ordered from your
-    preferred book store with the ISBN 978-2-37662-075-4.</li>
-
-    <li><a href="https://streetlib.co/isbn-9791222461823">in
-    Italian by the distributor StreetLib (softcover and eBook)</a> or <a href="https://www.lulu.com/shop/matthias-kirschner-and-sandra-brandst%C3%A4tter-and-luca-bonissi/ada-zangemann-una-fiaba-che-parla-di-software-skateboard-e-gelato-al-lampone/hardcover/product-2m2gvqw.html">by
-    the distributor Lulu.com (hardcover)</a> (affiliate links - the FSFE gets
-    42% for the paper book and 72% for the eBook) and can be ordered from your
-    preferred book store with the ISBN 979-12-224-6182-3.</li>
-
-    <li><a href="https://modspil.dk/">in
-    Danish by the publisher Modspil</a> and can be ordered from your
-    preferred book store with the ISBN 978-1-7185-0318-2.</li>
-
-  </ul>
-
-  <h2>Book Reviews</h2>
-  
-  <blockquote>
-
-  <p>"A rousing tale of self-reliance, community, and standing up
-  to bullies." - <em>Cory Doctorow, Sci-Fi
-  Author</em></p>
-
-  <p>"Introduces readers young and old to the power and peril of
-  software." - <em>Vint Cerf, Computer Scientist and One
-  of the Inventors of the Internet</em></p>
-
-  <p>"The book is a motivation for the first demo and a little bit
-  of civil disobedience.  It is a utopia of possibilities to make the world
-  better with limited means and little money, and an example without moralistic
-  finger-pointing, that control does not make happy." - <em>Anna Biselli,
-  Editor-in-Chief Netzpolitik.org</em></p>
-
-  <p>"Even as a non-child, I was captivated by the story from the
-  first page to the last. Kudos to the author for packaging difficult topics
-  such as monopolies, lobbyism, digital divide, software freedom, digital
-  autonomy, IoT, consumer control, e-waste and much more in a child-friendly
-  form in an easily understandable and exciting storyline." - <em>Jörg Luther,
-  chief editor of the German Linux-Magazin, LinuxUser, Raspberry Pi Geek</em>
-  </p>
-
-  <p>“What a fun read! I recognize myself in Ada at many moments.” - 
-  <em>Isabela Fernandes, Executive Director, The Tor project</em></p>
- 
-   <p>“I love this book and I love that it can be shared and translated and adapted easily because licensed freely under a Creative Commons license (BY-SA).” - 
-  <em>Lawrence Lessig, Founder of Creative Commons</em></p>
- 
-  <p>
-   <em><a href="/activities/ada-zangemann/book-reviews.html">Read all the reviews we have received.</a></em>
- </p>
-
- </blockquote>
-  
-  <figure class="no-border">
-    <a href="/activities/ada-zangemann/book-reviews.html">
-      <img src="https://pics.fsfe.org/uploads/medium/624801358184dc7876117b818a8b6b83.png" alt="open book with night scene"/>
-    </a>
-  </figure>
- 
- <blockquote>
-    
-  <p>“Ada &amp; Zangemann brings a highly topical, technically relevant 
-  subject to children.” - <em>Catharina Maracke, Chair of the Board, 
-  Open Source Initiative</em></p>
-
-  <p>“Software freedom is a critical component to having technology 
-  that we can rely on as a society, and it never is too early to learn 
-  about why it is so important. I can't wait to read this book to 
-  my kids!” - <em>Karen Sandler, Executive Director, Software Freedom 
-  Conservancy</em></p>
-
-  <p>“In this hopeful story Ada and her friends join a movement that 
-  started back in 1983. Their courageous adventure of software freedom 
-  and learning how technology works is a wonderful way to introduce 
-  young people everywhere to the joys of tinkering!” - <em>Zoë Kooyman, 
-  Executive Director, Free Software Foundation</em></p>
-
-  <p>
-   <em><a href="/activities/ada-zangemann/book-reviews.html">Read all the reviews we have received.</a></em>
-  </p>
-
-  </blockquote>
-
-  <h2>Book readings</h2>
-
-  <p>The author Matthias Kirschner has already given several readings of the
-  book: At events for children and adults (from 6 to 106 years), in school
-  classes, libraries and on other occasions. If you are are interested in a
-  reading by the author or in other available languages by FSFE volunteers,
-  please contact us at <email mailto="yes" subject="Ada and Zangemann">contact@fsfe.org</email>.</p>
-
-  <figure>
-    <img src="https://pics.fsfe.org/uploads/medium/cb/05/399d19f13425f28039489cec0d86.jpg" alt="Many children in the largest cinema room in Offenburg/Germany during a book reading"/>
-    <figcaption>
-      Author reading to over 150 3rd graders in the largest cinema room of Offenburg. CC-BY-SA Stadt Offenburg / herrfichtner
-    </figcaption>
-  </figure>
-
-  <h2>How to learn coding?</h2>
-
-  <p>There are many resources out which help young people to learn programming.
-  Our community is gathering more information about that topic on our <a href="https://docs.fsfe.org/en/Activities/ProgrammingForChildren">wiki
-  page</a>, and we invite you to help us with amending and keeping this
-  up-to-date.</p>
-
-  <h2>Stickers and postcards for all</h2>
-
-  <div class="grid-50-50">
-    <div class="box">
-      <figure class="no-border">
-        <img src="/contribute/promopics/childrensbook-sticker-zangemann-2022-thumb.png" alt="A die-cut sticker of Zangemann protagonist in the children's book Ada and Zangemann - A tale of software, skateboards, and raspberry ice cream."/>
-      </figure>
-    </div>
-
-    <div class="box">
-      <figure class="no-border">
-        <img src="/contribute/promopics/childrensbook-sticker-ada-2022-thumb.png" alt="A die-cut sticker of Ada protagonist in the children's book Ada and Zangemann - A tale of software, skateboards, and raspberry ice cream."/>
-      </figure>
-    </div>
+<div class="card-grid">
+	
+  <div class="card">
+    <a href="/activities/ada-zangemann/about.html">
+		<h2>About the Book</h2>
+		<img src="https://pics.fsfe.org/uploads/medium/94/f4/aec90b9dfe2e0f5073003fca5d05.png" alt="" width="600" height="400"/>
+	</a>
+    <p>
+		Learn everything about the book: its story, themes, the people 
+		who created it, and where to find it in your language or 
+		edition.
+    </p>
   </div>
-
-  <p>We provide some "Ada &amp; Zangemann" stickers. You can order them at no cost on our <a href="/contribute/spreadtheword#childrensbook">information material page</a>. Get them all!</p>
- 
-<h2>Get active</h2>
-
-  <figure>
-    <a href="https://pics.fsfe.org/uploads/original/10/46/b8108b5ebde36b3082da32884770.jpg">
-    <img src="https://pics.fsfe.org/uploads/medium/10/46/b8108b5ebde36b3082da32884770.jpg" alt=" Illustration of diverse crowd protesting. Protesters shout cheerfully and hold icecream cones. Slogans write: Do your homework mr President and we will do ours - Hacking 4 Freedom - Don't wreck our tech - There is no code B - They are young and need the code. A robot, two birds, and three dogs accompany the protest."/></a>
-    <figcaption>
-      Illustration from the book.  <a href="/contribute/spreadtheword#jtsfm-poster">Get a poster or a postcard with the illustration at no cost.</a>
-    </figcaption>  
-  </figure>
   
-<p>
-  Would you like to raise awareness for software freedom? If you liked 
-  the book, here are some ideas.
-</p>
+  <div class="card">
+    <a href="/activities/ada-zangemann/movie.html">
+		<h2>The Movie</h2>
+		<img src="https://pics.fsfe.org/uploads/medium/69/fd/659935c26e82968d163ab136fbf8.png" alt="" width="600" height="400"/>
+	</a>
+    <p>
+		Watch the Ada &amp; Zangemann movie and explore versions in different 
+		languages and formats. 
+    </p>
+  </div>
+  
+  <div class="card">
+    <a href="/activities/ada-zangemann/resources.html">
+		<h2>Resources</h2>
+		<img src="https://pics.fsfe.org/uploads/medium/83/fb/cb5df046d847fd197a8392ecb050.png" alt="" width="600" height="400"/>
+	</a>
+    <p>
+		Explore a collection of materials for educators and curious 
+		readers: teaching guides, images, illustrations, slides, 
+		printables, and source files.
+    </p>
+  </div>
+  
+  <div class="card">
+    <a href="/activities/ada-zangemann/involved.html">
+		<h2>Get Involved</h2>
+		<img src="https://pics.fsfe.org/uploads/medium/c8/42/61c6e99d3d29d4da9c727b6ec0a6.jpg" alt="" width="600" height="400"/>
+	</a>
+    <p>
+		Spread the word about the story by sharing it with others. 
+		Discover more ideas on how to inspire children's interest in 
+		tinkering and encourage them to shape technology.
+    </p>
+  </div>
+  
+  <div class="card">
+    <a href="/activities/ada-zangemann/events.html">
+		<h2>Events</h2>
+		<img src="https://pics.fsfe.org/uploads/medium/7e/b6/350e5a434d4ae21021280f3f1bda.png" alt="" width="600" height="400"/>
+	</a>
+    <p>
+		Find out where the book is being presented, read 
+		aloud, screened, or discussed. Check upcoming events or 
+		explore the archive of past events.
+    </p>
+  </div>
+  
+  <div class="card">
+    <a href="/activities/ada-zangemann/book-reviews.html">
+		<h2>Reviews</h2>
+		<img src="https://pics.fsfe.org/uploads/medium/54/e9/50126f9b948b901102ef2defec86.png" alt="" width="600" height="400"/>
+	</a>
+    <p>
+		Read what critics, educators, and readers have said about 
+		the book. Browse selected quotes or dive into full reviews, 
+		available in multiple languages.
+    </p>
+  </div>
+  
+</div>
 
-<ul>
-  <li>
-    <strong>Suggest</strong> the book to your public library. Often you 
-    can recommend new books to libraries.
-  </li>
-  <li>
-    <strong>Donate</strong> the book to a public library. This is a 
-    good option for cases when a library does not have the budget to 
-    buy the book, but you can afford it. Your copy will make many 
-    people happy.
-  </li>
-  <li>
-    Give your <strong>feedback</strong> to bookstores about the book, 
-    so they recommend it to others.
-  </li>
-  <li>
-    Write a <strong>review</strong> if you bought the book online. 
-  </li>
-  <li>
-    Offer schools, youth clubs or elderly homes to <strong>read the 
-    book</strong> there. They often ask for people reading books and it 
-    is a good way to talk about software freedom. <a href="https://git.fsfe.org/FSFE/ada-zangemann/src/branch/main/Presentations">These 
-    slides</a> can be used as a background while you read with a 
-    projector.
-  </li>
-</ul>
+<h2>Already a Teenager?</h2>
 
-
-  <h2>Dive into software freedom</h2>
-
-  <p>You would like to receive news about "Ada &amp; Zangemann", for example
-  about new stickers or other materials, new translations, or other information
-  about the book? You can subscribe to the FSFE's mailings and not miss this
-  information as well as also receiving general information about software
-  freedom and the FSFE's work.</p>
-
-  <module id="banner-subscribe"/>
-
-  <h2>Already a teenager?</h2>
-
-  <figure>
-    <img src="https://pics.fsfe.org/uploads/medium/0b5182d1811b20495b4b2820d55b24da.jpg" alt="Three teenagers standing in a hackerspace"/>
-  </figure>
-  <p class="license">
-    Graphic by <a href="https://mullana.de/">Lisa Schmidt</a>, <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA 4.0</a>
-  </p>
-
-  <p>For teenagers who are already experienced in programming, the FSFE is organising the <a href="/activities/yh4f/">"Youth hacking for freedom" coding competition</a>.
-  Please help us to promote this activity and encourage teenagers to start programming.</p>
+<p>For teenagers who are already experienced in programming, the FSFE 
+is organising the <a href="/activities/yh4f/">"Youth hacking for 
+freedom" coding competition</a>. Please help us to promote this 
+activity and encourage teenagers to start programming.</p>
 
 </body>
 
-<image url="https://pics.fsfe.org/uploads/original/94/f4/aec90b9dfe2e0f5073003fca5d05.png" alt="A three way power adaptor, a tin of paint, a pair of pliers, a mouse,  a soldering iron, a phone, and a keyboard form a circle with a thin white curly line. Inside the circle, Ada and Zangemann face each other. Zangemann is an old man with glasses and Ada is a young girl with curly black hair."/>
-
-<sidebar promo="our-work">
-  <h3>About the book</h3>
-  <ul>
-    <li><a href="/activities/ada-zangemann/book-reviews.html">Reviews</a></li>
-    <li><a href="/activities/ada-zangemann/letters.html">Letters to Zangemann</a></li>
-    <li><a href="/activities/ada-zangemann/movie.html">Movie</a></li>
-    <li><a href="/activities/ada-zangemann/drawings.html">Drawings</a></li>
-  </ul>
-  <h3>Publishers</h3>
-  <ul>
-    <li><a href="https://nostarch.com/ada-zangemann">No Starch Press</a> (English book)</li>
-    <li><a href="https://dpunkt.de/produkt/ada-und-zangemann/?ref=10022">O'Reilly</a> (German book)</li>
-    <li><a href="https://cfeditions.com/ada/">C&amp;F éditions</a> (French book)</li>
-    <li><a href="https://streetlib.co/isbn-9791222461823">Distributor StreetLib</a> (Italian book)</li>
-    <li><a href="https://modspil.dk/">Modspil</a> (Danish book)</li>
-  </ul>
-  <h3>Resources</h3>
-  <ul>
-    <li><a href="https://git.fsfe.org/FSFE/ada-zangemann">Additional Materials / Git Repository</a></li>
-    <li><a href="https://git.fsfe.org/FSFE/ada-zangemann/src/branch/main/Presentations">Reading presentations</a></li>
-    <li><a href="https://sharepic.fsfe.org/#ada">Sharepic generator</a></li>
-    <li><a href="/contribute/spreadtheword#childrensbook">Order materials</a></li>
-  </ul>
-
-  <ul>
-    <li><a href="#id-get-active">Get Active</a></li>
-  </ul>
-</sidebar>
-
 <translator/>
+
 </html>
 

fsfe.org/activities/ada-zangemann/involved.en.xhtml

@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="utf-8"?>
+<html>
+<version>1</version>
+
+<head>
+  <title>Ada &amp; Zangemann - A Tale of Software, Skateboards, and Raspberry Ice Cream - Get Involved</title>
+</head>
+
+<body class="article">
+
+  <h1 class="p-name">Get Involved</h1>
+
+  	<figure>
+		<img src="https://pics.fsfe.org/uploads/medium/c8/42/61c6e99d3d29d4da9c727b6ec0a6.jpg" alt=""/>
+		<figcaption>
+		Illustration from the book
+		</figcaption>  
+	</figure>
+	
+  <h2 id="read">Read It to Others</h2>
+  	<p>
+    One way to spark children's interest in coding is to read the book to them: in your family, or to your friends' or co-workers' families. It is very motivating and fulfilling to discuss the topic with children and hear about their ideas on what they want to accomplish with technology. You can, for example, simply download <a href="https://git.fsfe.org/FSFE/ada-zangemann/src/branch/main/Presentations">the presentation PDF slides</a> and use 
+    <a href="https://download.fsfe.org/ada-zangemann/generated/Ada_Zangemann-reading.en.html">the text with markers for when to turn the slides</a>.</p>
+    <p>
+    If you feel comfortable, you can also organise a larger book reading. You can offer that to schools, youth clubs, or libraries. They often look for people to read books and it 
+	is a good way to talk with children about their thoughts on technology and about software freedom. On the <a 
+	href="/activities/ada-zangemann/resources/">resources page</a>, you 
+	can find additional material of the book. 
+	</p>
+
+      <figure>
+        <img src="https://pics.fsfe.org/uploads/medium/ec/09/aa1f3c2df1b0814babffb7e7274b.jpg" alt="A teacher standing in a classroom holding the book, with all the pupils holding the book in front of their heads."/>
+        <figcaption>
+          Ada and Zangemann reading in a French school 
+        </figcaption>
+      </figure>
+
+    <p>
+    If you organise a reading, we 
+	recommend that it takes place in a location with <strong>few distractions</strong>. 
+	Readings in "open spaces" have turned out to be more challenging for the 
+	reader, and especially younger children in particular are much more easily distracted by 
+	noise or movement in another area of the room. For <strong>smaller 
+	readings</strong>, try to create a cosy environment with as little space as possible between you and the audience. For example, making the 
+	audience sit on the floor on pillows, with the reader in front of 
+	them. You can find everything you need to organise a reading in <a 
+	href="https://git.fsfe.org/FSFE/ada-zangemann/src/branch/main/docs/readings-organisation.md">our documentation</a>.
+	</p>
+
+	    <figure>
+            <img src="https://pics.fsfe.org/uploads/medium/e6/cc/64eae3bd6d5ce239b1c5fff5f9e1.jpg" alt="two people with a book"/>
+            <figcaption>
+              Event with reading of the book in Ukrainian
+            </figcaption>
+        </figure>
+
+	<p>
+	The author, Matthias Kirschner, has already given several readings of 
+	the book: At events for children and adults (from 6 to 106 years), 
+	in school classes, libraries, cinemas, and on other occasions. If you are 
+	interested in a reading by the author or in other available 
+	languages by the FSFE volunteers, please contact us at <email 
+	mailto="yes" subject="AZ-events">contact@fsfe.org</email>.
+	</p>
+
+	<figure>
+		<img src="https://pics.fsfe.org/uploads/medium/0d/84/1204ce13be0a41d7006f924e0f3f.jpg" alt="Many children and addults in the conference SFSCON 2023 during a book reading."/>
+		<figcaption>
+		Italian reading by Marta Andreoli and Dario Presutti at SFSCON 2023
+		</figcaption>
+	</figure>
+
+  <h2 id="share">Share your Thoughts</h2>
+
+	<figure>
+		<img src="https://pics.fsfe.org/uploads/original/06/a9/4731e1c8ad5460091f60d4f82cdb.jpg" alt="Sharepic with a portrait of a person and the quote Curiosity and the Freedom to tinker naturally explains Free Software in this light hearted children’s story. Why not have our ice cream machines that make every flavor and shape? Excellent work!"/>
+		<figcaption>
+            <a href="/activities/ada-zangemann/book-reviews.html#kahle">Sharepic by Brewster Kahle, Founder Internet Archive (Europe)</a>
+		</figcaption>
+	</figure>
+
+    <p>
+	A picture says more than a thousand words! You can use <a 
+	href="https://sharepic.fsfe.org/#ada">the sharepic generator</a> to 
+	show your love for the book and post your review by generating a 
+	picture that you can share on social media channels or add to your 
+	blog.
+	</p>
+  
+  <h2 id="gift">Gift the Book to Others</h2>
+
+    <figure>
+        <img src="https://pics.fsfe.org/uploads/medium/2a/17/04697eb71d5c44bd473e0cea7773.png" alt="A girl reading a book labeled as remix version"/>
+        <figcaption>
+          Mila reading a remix version of Ada &amp; Zangemann © CC-BY 4.0 Romain Debailleul 
+        </figcaption>
+      </figure>
+
+	<p>
+    Gifting the book to friends and family or co-workers will help to spark children's interest in coding. You can <a href="/activities/ada-zangemann/about.html#editions">buy 
+        a copy online</a> or at your favourite bookstore. After buying it helps a lot if you leave a review or feedback for the store, so they can recommend it to others as well. 
+    </p>
+    <p>
+    If you would like to buy a larger number of discounted books, e.g. to gift to employees, partners, or for events, please contact us at <email mailto="yes" subject="AZ-translations">contact@fsfe.org</email>.
+	</p>
+  
+  <h2 id="suggest">Suggest It to Libraries / Schools</h2>	
+	<p>
+	You can <strong>recommend</strong> the book to your public library 
+	or you can even <strong>donate</strong> a copy if a library does 
+	not have the budget to buy it but you can afford to. The same 
+	applies to youth clubs, schools, or hackerspaces. Your copy will 
+	enable children to read it who might not have the financial means 
+	to buy it themselves. 
+	</p>
+
+
+	<figure>
+		<img src="https://pics.fsfe.org/uploads/medium/b6/f2/ee6217359ddd3df59299a601c3b1.jpg" alt="Many children in a classroom in Boston (USA) during a book reading with the author."/>
+		<figcaption>
+		Author reading of Ada &amp; Zangemann in Boston, USA
+		</figcaption>
+	</figure>
+  
+  <h2 id="ebook">Share as Example Files</h2>
+
+  <p>All the material around the book and the movie is available under Creative Commons CC By Share Alike. This enables you to include the e-book or the movie on computers at schools, universities, or as example files for GNU/Linux distributions. This is a great way to spread the story further. If you do, please let us know.</p>
+  
+  <h2 id="screening">Organise a Screening</h2>
+
+	  <figure>
+		<img src="https://pics.fsfe.org/uploads/medium/61/c9/c398ea1103f74fccefa49a8d41e6.jpg" alt="A movie screen showing the film about Ada and Zangemann. On either side of the screen are several rows of red seats with children sitting in them, seen from behind."/>
+		<figcaption>
+			Screening of the movie at its German premiere in Essen, 2024
+		</figcaption>  
+	  </figure>
+
+  <p>If reading the book aloud is not your thing, you could also organise a movie screening. Either in a private setting, or with the <a href="/activities/ada-zangemann/movie.html#screening">DCP movie files</a> even renting a cinema and inviting families, your employees with children, or school classes to attend. For the German premiere, we rented the largest cinema in Germany and watched the movie with over 800 children. This is perfect to spark children's interest in technology.</p>
+    
+  <h2 id="translate">Translate</h2>
+	<p>
+	The FSFE would like as many people as possible to learn about the 
+	book and be able to read it in their mother tongue. If you would 
+    like to do a community translation you can directly start on <a href="https://hosted.weblate.org/projects/fsfe/ada-zangemann/">our Weblate instance</a>, please let <a 
+	href="/contribute/translators/">the FSFE's translation team</a> 
+	know about it and have a look at the <a 
+	href="https://git.fsfe.org/FSFE/ada-zangemann/src/branch/main/docs/translation-guidelines.md">translation 
+	guidelines</a>.</p>
+	<p>
+	If you have any contacts 
+	with publishers, which are interested to publish the book in 
+	another language, or if you are interested in ordering a larger number of books if the book would be available in a certain language, then 
+	please contact us at <email mailto="yes" subject="AZ-translations">contact@fsfe.org</email>.
+	</p>
+	
+  <h2 id="adapt">Adapt</h2>
+
+  <p>
+  In the spirit of the license, you can automatically generate book variants based on templates and 
+  the translated text yourself. Do you want to change the names in the book to your children's names? Do you dislike some parts of the story and want to make changes? <a 
+  href="https://git.fsfe.org/FSFE/ada-zangemann/src/branch/main/docs/building.md">This 
+  practical guide</a> explains how to build the various output formats. It is the same tooling that automatically builds <a href="https://download.fsfe.org/ada-zangemann/generated/">different formats of the book</a> from the <a href="https://hosted.weblate.org/projects/fsfe/ada-zangemann/">translations on Weblate</a> such as <a href="https://download.fsfe.org/ada-zangemann/generated/Ada_Zangemann-screen.en.mediumres.pdf">the screen-readable PDFs</a>. 
+  </p>
+
+
+  <h2 id="automation">Help with Automation</h2>
+	<p>
+	The impact of the story is increased when the story is available in 
+	more languages and more formats. Therefore, the automation should 
+	make it easy to add new translations and formats. It should also be 
+	easy to generate and finetune output files, regardless of technical 
+	skill or operating system. Free culture should be favoured when 
+	selecting programs and content such as fonts. If you would like to 
+	help improve the tool chain for the story, you can check out <a 
+	href="https://git.fsfe.org/FSFE/ada-zangemann/src/branch/main/docs/automation-design.md">the 
+	relevant documentation</a>.
+	</p>
+      
+</body>
+
+<followup>subscribe-nl</followup>
+
+<sidebar promo="our-work">
+  <h3><a href="/activities/ada-zangemann/">Overview</a></h3>
+  <h3><a href="/activities/ada-zangemann/about.html">About the Book</a></h3>
+  <h3><a href="/activities/ada-zangemann/movie.html">The Movie</a></h3>
+  <h3><a href="/activities/ada-zangemann/resources.html">Resources</a></h3>
+  <h3>Get Involved</h3>
+  <ul>
+    <li><a href="#read">Read It to Others</a></li>
+    <li><a href="#share">Share your Thoughts</a></li>
+    <li><a href="#gift">Gift the Book to Others</a></li>
+    <li><a href="#suggest">Suggest It to Libraries / Schools</a></li>
+    <li><a href="#ebook">Share as Example Files</a></li>
+    <li><a href="#screening">Organise a Screening</a></li>
+    <li><a href="#translate">Translate</a></li>
+    <li><a href="#adapt">Adapt</a></li>
+    <li><a href="#automation">Help with Automation</a></li>
+  </ul>
+  <h3><a href="/activities/ada-zangemann/events.html">Events</a></h3>
+  <h3><a href="/activities/ada-zangemann/book-reviews.html">Reviews</a></h3>
+</sidebar>
+<translator/>
+</html>

fsfe.org/activities/ada-zangemann/letters.en.xhtml

@@ -32,7 +32,7 @@
   <ul>
     <li><a href="/activities/ada-zangemann/index.html">Overview</a></li>
     <li><a href="/activities/ada-zangemann/book-reviews.html">Reviews</a></li>
-    <li><a href="/activities/ada-zangemann/movie.html">Movie</a></li>
+    <li><a href="/activities/ada-zangemann/movie.html">The Movie</a></li>
     <li><a href="/activities/ada-zangemann/drawings.html">Drawings</a></li>
   </ul>
   <h3>Publishers</h3>

fsfe.org/activities/ada-zangemann/movie.en.xhtml

@@ -1,103 +1,96 @@
 <?xml version="1.0" encoding="utf-8"?>
 <html>
-<version>4</version>
+<version>5</version>
 
 <head>
-  <title>Ada &amp; Zangemann - A Tale of Software, Skateboards, and Raspberry Ice Cream - Movie</title>
+  <title>Ada &amp; Zangemann - A Tale of Software, Skateboards, and Raspberry Ice Cream - The Movie</title>
 </head>
 
 <body class="article">
 
-  <h1 class="p-name">The Ada &amp; Zangemann Movie</h1>
-
-  <div class="peertube-video"><iframe title="Ada &amp; Zangemann - A Tale of Software, Skateboards, and Raspberry Ice Cream" width="100%" height="100%" src="https://media.fsfe.org/videos/embed/91cb5612-09b7-45a8-82d1-1a921d38df29" frameborder="0" allowfullscreen="" sandbox="allow-same-origin allow-scripts allow-popups allow-forms" style="position: absolute; inset: 0px;"/></div>
-
+  <h1 class="p-name">The Movie</h1>
+  
+  	<figure>
+		<img src="https://pics.fsfe.org/uploads/medium/69/fd/659935c26e82968d163ab136fbf8.png" alt="A movie screen showing the film about Ada and Zangemann. On either side of the screen are several rows of red seats with children sitting in them, seen from behind."/>
+		<figcaption>
+		Screening of the movie at its German premiere in Essen, 2024
+		</figcaption>  
+	</figure>
+ 
   <p>
-    Following the success of the illustrated book "Ada &amp; Zangemann - A Tale of
-    Software, Skateboards, and Raspberry Ice Cream", the story is since 2024 also available as
-    an animated movie. 
+    Following the success of the illustrated book "Ada &amp; Zangemann - A Tale
+    of Software, Skateboards, and Raspberry Ice Cream", and thanks to
+    <a href="/donate/thankgnus-2026.html">the FSFE's donors</a>
+    the story has been available as an animated movie since 2024.
   </p>    
   <p>
-	  Released as an Open Educational Resource, under a Creative Commons 
-	  By Share-Alike Licence, it tells tells the story of the famous 
-	  inventor Zangemann and the girl Ada, a curious tinkerer. Ada begins 
-	  to experiment with hardware and software, and in the process 
-	  realises how crucial it is for her and others to control 
+	  Released as an Open Educational Resource, under a Creative 
+	  Commons By Share-Alike Licence, it tells the story of the 
+	  famous inventor Zangemann and the girl Ada, a curious tinkerer. 
+	  Ada begins to experiment with hardware and software, and in the 
+	  process realises how crucial it is for her and others to control 
 	  technology.
   </p>	
   <p>
-  This fascinating story, written by <a href="https://k7r.eu">Matthias Kirschner</a>, illustrated by <a href="http://sandra-brandstaetter.com/">Sandra Brandstätter</a> and animated by <a href="https://monstroos.com/">Monströös</a>,  
-	  encourages children, especially girls, to tinker with hardware and 
-	  software and encouraging them to shape their own technology.
+	This fascinating story, written by <a href="https://k7r.eu">Matthias 
+	Kirschner</a>, illustrated by <a 
+	href="http://sandra-brandstaetter.com/">Sandra Brandstätter</a> and 
+	animated by <a href="https://monstroos.com/">Monströös</a>, 
+	encourages children, especially girls, to tinker with hardware and 
+	software and to shape their own technology.
+  </p>
+  
+   <div class="peertube-video"><iframe title="Ada &amp; Zangemann - A Tale of Software, Skateboards, and Raspberry Ice Cream" width="100%" height="100%" src="https://media.fsfe.org/videos/embed/91cb5612-09b7-45a8-82d1-1a921d38df29" frameborder="0" allowfullscreen="" sandbox="allow-same-origin allow-scripts allow-popups allow-forms" style="position: absolute; inset: 0px;"/></div>
+
+  <h2 id="language">Language Versions</h2>
+  
+   <p>
+   The movie is released in the languages below. For each additional 
+   language version, we require <a 
+   href="https://my.fsfe.org/donate?amount=3600&amp;period=x&amp;referrer=az-translations">roughly 
+   €3,600 in donations</a>. Please contact us about planned language 
+   versions and how you can support them. 
   </p>
 
-  <p>
-    <em>The movie is released in the languages below. For each additional language versions we require roughly 3600€ in donations. Please contact us about planed language versions.</em>
-  </p>
+  <movie-languages/>
 
-  <h2>Download locations</h2>
-  <ul>
-    <li>FSFE Peertube:
-      <a href="https://media.fsfe.org/w/7S9bNkf36e7vBnBrBhj7vS">Dansk</a>, 
-      <a href="https://media.fsfe.org/w/j1c6LQVZ8qnCLLwpXMuw3M">English</a>,
-      <a href="https://media.fsfe.org/w/jPLeR3vpYE7zWaTYdsB9JU">French</a>,
-      <a href="https://media.fsfe.org/w/aw4EHJYVBSQGHPS22xXBG2">German</a>,
-      <a href="https://media.fsfe.org/w/p/k77oZk33uLy95DZmx8FUHJ">Italian</a>,
-      <a href="https://media.fsfe.org/w/mPiL4nzoJ21gWiG4JHLATf">Spanish</a>
-    </li>
-    <li>archive.org: <a href="https://archive.org/details/ada-zangemann-a-tale-of-software-skateboards-and-raspberry-ice-cream">English</a></li>
-    <li>Wikimedia: 
-      <a href="https://commons.wikimedia.org/wiki/File:Ada_%26_Zangemann_-_A_Tale_of_Software,_Skateboards,_and_Raspberry_Ice_Cream.webm">English</a>,
-      <a href="https://commons.wikimedia.org/wiki/File:Ada-zangemann-un-conte-sur-les-logiciels-le-skateboard-et-la-glace-%C3%A0-la-framboise.webm">French</a>,
-      <a href="https://commons.wikimedia.org/wiki/File:Ada-zangemann-ein-maerchen-ueber-software-skateboards-und-himbeereis.webm">German</a>,
-      <a href="https://commons.wikimedia.org/wiki/File:Ada-zangemann-un-cuento-sobre-software-monopatines-y-helado-de-frambuesa.webm">Spanish</a>
-    </li>
-    <li>Youtube:
-      <a href="https://youtu.be/ac3ZZ7WUuZM">English</a>,
-      <a href="https://youtu.be/ms5vjV4IfoA">French</a>,
-      <a href="https://youtu.be/mxI3FWk7wec">German</a>,
-      <a href="https://youtu.be/xK2vVRR2iPc">Spanish</a>
-    </li>
-  </ul>
-
-  <p>For screenings in a cinema you can <a href="https://download.fsfe.org/ada-zangemann/cinema/">download the necessary DCP files from the FSFE's download server</a>.</p>
-
-  <h2>Sharepic generator</h2>
-  <p>
-    Do you like "Ada &amp; Zangemann"? Leave your review in your social media networks with our <a href="https://sharepic.fsfe.org/#ada">sharepic generator</a>!
-  </p>
+  <h2 id="screening">Screenings</h2>
 
+    <figure>
+      <img src="https://pics.fsfe.org/uploads/medium/56/c4/6625476eb96076bc202489a23bcd.jpg" alt="Picture with contributors of the movie at the stage of the Lichtburg in Essen, Germany's largest cinema."/>
+      <figcaption>
+      	Screening of the movie at its German premiere in Essen, 2024
+      </figcaption>  
+    </figure>
+  
+	  <p>For screenings in a cinema, you can <a 
+	  href="https://download.fsfe.org/ada-zangemann/cinema/">download the 
+	  necessary DCP files from the FSFE's download server</a>.</p>
+	  
+	  <p>Thanks to Lichtburg Essen for taking over the creation of the DCP 
+	  files for the film in different languages free of charge. For the 
+	  creation process, they used Free Software tools: Handbrake, 
+	  Subtitle Edit, and OpenShot Video Editor for pre-editing the 
+	  material; DCP-o-matic on a powerful render server for the actual 
+	  DCP creation; and Aurora Files, FileZilla Server, and Client for 
+	  the provision.</p>
+	  
 </body>
 
-<followup>donate</followup>
+<followup>subscribe-nl</followup>
 
 <sidebar promo="our-work">
-  <h3>About the book</h3>
+  <h3><a href="/activities/ada-zangemann/">Overview</a></h3>
+  <h3><a href="/activities/ada-zangemann/about.html">About the Book</a></h3>
+  <h3>The Movie</h3>
   <ul>
-    <li><a href="/activities/ada-zangemann/index.html">Overview</a></li>
-    <li><a href="/activities/ada-zangemann/letters.html">Letters to Zangemann</a></li>
-    <li><a href="/activities/ada-zangemann/book-reviews.html">Reviews</a></li>
-    <li><a href="/activities/ada-zangemann/drawings.html">Drawings</a></li>
-  </ul>
-  <h3>Publishers</h3>
-  <ul>
-    <li><a href="https://nostarch.com/ada-zangemann">No Starch Press</a> (English book)</li>
-    <li><a href="https://dpunkt.de/produkt/ada-und-zangemann/?ref=10022">O'Reilly</a> (German book)</li>
-    <li><a href="https://cfeditions.com/ada/">C&amp;F éditions</a> (French book)</li>
-    <li><a href="https://streetlib.co/isbn-9791222461823">Distributor StreetLib</a> (Italian book)</li>
-    <li><a href="https://modspil.dk/">Modspil</a> (Danish book)</li>
-  </ul>
-  <h3>Resources</h3>
-  <ul>
-    <li><a href="https://git.fsfe.org/FSFE/ada-zangemann">Additional Materials / Git Repository</a></li>
-    <li><a href="https://git.fsfe.org/FSFE/ada-zangemann/src/branch/main/Presentations">Reading presentations</a></li>
-    <li><a href="https://sharepic.fsfe.org/#ada">Sharepic generator</a></li>
-    <li><a href="/contribute/spreadtheword#childrensbook">Order materials</a></li>
-  </ul>
-
-  <ul>
-    <li><a href="/activities/ada-zangemann/index.html#id-get-active">Get Active</a></li>
+    <li><a href="#language">Language Versions</a></li>
+    <li><a href="#screening">Screenings</a></li>
   </ul>
+  <h3><a href="/activities/ada-zangemann/resources.html">Resources</a></h3>
+  <h3><a href="/activities/ada-zangemann/involved.html">Get Involved</a></h3>
+  <h3><a href="/activities/ada-zangemann/events.html">Events</a></h3>
+  <h3><a href="/activities/ada-zangemann/book-reviews.html">Reviews</a></h3>
 </sidebar>
 
 <translator/>

fsfe.org/activities/ada-zangemann/movie.sources

@@ -0,0 +1 @@
+fsfe.org/activities/ada-zangemann/data/language/movie/*:[]

fsfe.org/activities/ada-zangemann/movie.xsl

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:import href="../../fsfe.xsl"/>
+  <!-- ==================================================================== -->
+  <!-- Dynamic list of languages                                               -->
+  <!-- ==================================================================== -->
+  <xsl:template match="movie-languages">
+    <xsl:for-each select="/buildinfo/document/set/language">
+		<xsl:sort select="@value" order="ascending"/>
+		<xsl:variable name="language" select="@value"/>
+		<ul>
+			<li>
+			<p>
+				<xsl:value-of select="$language"/>
+					<xsl:text>: </xsl:text>
+				<xsl:for-each select="platform">
+				<a>
+					<xsl:attribute name="href">
+						<xsl:value-of select="url"/>
+					</xsl:attribute>
+					<xsl:value-of select="name"/>
+				</a>
+				<xsl:if test="position() != last()">
+					<xsl:text>, </xsl:text>
+				</xsl:if>
+				</xsl:for-each>
+            </p>			
+			</li>
+		</ul>
+    </xsl:for-each>
+  </xsl:template>
+</xsl:stylesheet>

fsfe.org/activities/ada-zangemann/resources.en.xhtml

@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<html>
+<version>1</version>
+
+<head>
+  <title>Ada &amp; Zangemann - A Tale of Software, Skateboards, and Raspberry Ice Cream - Resources</title>
+</head>
+
+<body class="article">
+
+  <h1 class="p-name">Resources</h1>
+	
+	<figure>
+		<img src="https://pics.fsfe.org/uploads/medium/b3/f2/8a0369e4b835a0459254a294e56e.png" alt=""/>
+		<figcaption>
+		Illustration from the book
+		</figcaption>  
+	</figure>
+	
+  <h2 id="materials">Teaching Materials</h2> 
+    <p>
+        Our goal is to share available resources between educators so materials
+        can be reused, translated, and adapted to educators' own needs. The
+        following materials around Ada &amp; Zangemann are currently known to
+        us:
+
+	<ul>
+        <li>The French Ministry of Education <a href="https://ada-zangemann.forge.apps.education.fr/">created a portal about Ada &amp; Zangemann</a>. The portal includes <a href="https://ada-zangemann.forge.apps.education.fr/ressources/pedagogique.html">teaching resources,</a> including an online comic-book creation application, <a href="https://ada-zangemann.forge.apps.education.fr/livre/en/az_en.html">an online version of the book in different languages</a>, the movie and audiobooks in different languages, <a href="https://ada-zangemann.forge.apps.education.fr/livre/az-diaporama.html">slides for reading at school</a>, a <a href="https://ada-zangemann.forge.apps.education.fr/jeu/">board game</a>, <a href="https://ada-zangemann.forge.apps.education.fr/ressources/telechargement.html">multilingual PDFs of the book</a>, and more.</li>
+        <li>The Austrian Ministry of Education <a href="https://www.eduvidual.at/course/view.php?id=218862">created an online course</a> which includes interactive activities, discussion guides, and traditional exercises. It presents complex topics such as monopolies, lobbying, the digital divide, software freedom, digital autonomy, the Internet of Things (IoT), and electronic waste in a child-friendly way as part of an engaging storyline.</li>
+		<li>One teacher started asking their pupils to write letters to Zangemann. We have published some of <a href="/activities/ada-zangemann/letters.html">the letters to Zangemann for which we have permission</a>. If you do similar exercises, we would love to hear from you, and we will ensure Zangemann gets the letters.</li>
+		<li>For younger children, we offer <a href="https://git.fsfe.org/FSFE/ada-zangemann/src/branch/main/DrawingTemplate">drawing templates.</a></li>
+	</ul>
+
+     	<figure>
+			<img src="https://pics.fsfe.org/uploads/medium/e1/b0/dde5fe47f17b6962454145dcba40.jpg" alt="A child's drawing of an invention titled “The Speedy Shoes”"/>
+			<figcaption>
+			A drawing of a child about a new invention
+			</figcaption>  
+		</figure>
+
+  <h2 id="stickers">Bookmarks, Stickers, ...</h2>
+
+	<p>
+	As information material, we provide some "Ada &amp; Zangemann" stickers, bookmarks, and postcards with the illustrations. You can order them at no cost on <a
+	href="/contribute/spreadtheword.html#childrensbook">our information 
+    material page</a>. In our <a href="/order/index.html">merchandise shop</a>, you can also get other materials such as Ada &amp; Zangemann tattoos.
+	</p>
+	
+	<div class="grid-50-50">
+		<div class="box">
+			<figure class="no-border">
+			<img src="/contribute/promopics/childrensbook-sticker-zangemann-2022-thumb.png" alt="A die-cut sticker of Zangemann protagonist in the children's book Ada and Zangemann - A tale of software, skateboards, and raspberry ice cream."/>
+			</figure>
+		</div>
+
+		<div class="box">
+			<figure class="no-border">
+			<img src="/contribute/promopics/childrensbook-sticker-ada-2022-thumb.png" alt="A die-cut sticker of Ada protagonist in the children's book Ada and Zangemann - A tale of software, skateboards, and raspberry ice cream."/>
+			</figure>
+		</div>
+	</div>
+
+  <h2 id="slides">Reading Slides</h2>
+	
+	<p>
+	We also offer <a href="https://git.fsfe.org/FSFE/ada-zangemann/src/branch/main/Presentations/en/ada-zangemann-reading.en.pdf">the presentation PDF slides</a> which together with 
+    <a href="https://download.fsfe.org/ada-zangemann/generated/Ada_Zangemann-reading.en.html">the text with markers for when to turn the slides</a>, can be used for book readings. 
+	</p>
+ 
+   <h2 id="source">Source Materials</h2>  
+	<p>
+	  In the <a href="https://git.fsfe.org/FSFE/ada-zangemann">Git 
+	  repository</a> you can find all the available sources and 
+	  additional material for the illustrated book and the movie "Ada 
+	  &amp; Zangemann - A Tale of Software, Skateboards and Raspberry 
+	  Ice Cream". For example if you need illustrations from the book, 
+	  you can check <a  
+	  href="https://git.fsfe.org/FSFE/ada-zangemann/src/branch/main/illustrations">this 
+	  directory</a>, which contains the illustrations, including the 
+	  drawn titles and drawn capitals. All are licensed under the same 
+	  Creative Commons licence used by Wikipedia.
+	</p>
+  
+  <h2 id="wallpapers">Wallpapers</h2>
+
+	<figure>
+		<a href="https://pics.fsfe.org/uploads/original/c8/42/61c6e99d3d29d4da9c727b6ec0a6.jpg">
+		<img src="https://pics.fsfe.org/uploads/medium/c8/42/61c6e99d3d29d4da9c727b6ec0a6.jpg" alt=""/></a>
+		<figcaption>
+            16:9 illustration from the book, also <a href="https://pics.fsfe.org/uploads/original/86/33/e732673d85fb299feded1001b7d7.png">available in 3:2</a>.
+		</figcaption>  
+	</figure>
+
+	<figure>
+		<a href="https://pics.fsfe.org/uploads/original/d7/d2/c26ee0ca3abd205ecbe0a8117b3b.jpg">
+		<img src="https://pics.fsfe.org/uploads/original/d7/d2/c26ee0ca3abd205ecbe0a8117b3b.jpg" alt=""/></a>
+		<figcaption>
+            "Ada &amp; Zangemann" by David Revoy, based on " Ada &amp; Zangemann" written by Matthias Kirschner and illustrated by Sandra Brandstätter − CC-BY-SA 4.0. All the files, including the sources, are available on <a href="https://www.peppercarrot.com/en/viewer/misc-src__2023-12-03_Ada-and-Zangemann_by-David-Revoy.html">David Revoy's website</a> who <a href="https://upload.wikimedia.org/wikipedia/commons/e/e3/Ada_from_Ada_%26_Zangemann_Krita_Process_David_Revoy.webm">created it with the Free Software Krita</a>. 
+		</figcaption>  
+	</figure>
+	
+	</p>
+
+  <h2 id="mailing">Mailing List for Educators</h2>
+	<p>
+		We maintain a mailing list of educators who exchange resources 
+		and ideas on how to use Ada &amp; Zangemann in teaching. Our 
+		goal is for more resources to be shared in the future. If you 
+		are an educator and would like to get in touch with others who 
+		use and create materials above, you can reach out to us via 
+		<email mailto="yes" 
+		subject="AZ-events">contact@fsfe.org</email> telling us about 
+		your background and your interest to join the group.
+	</p>
+
+</body>
+
+<followup>subscribe-nl</followup>
+
+<sidebar promo="our-work">
+  <h3><a href="/activities/ada-zangemann/">Overview</a></h3>
+  <h3><a href="/activities/ada-zangemann/about.html">About the Book</a></h3>
+  <h3><a href="/activities/ada-zangemann/movie.html">The Movie</a></h3>
+  <h3>Resources</h3>
+  <ul>
+    <li><a href="#materials">Teaching Materials</a></li>
+    <li><a href="#stickers">Bookmarks, Stickers, ...</a></li>
+    <li><a href="#slides">Reading Slides</a></li>
+    <li><a href="#source">Source Materials</a></li>
+    <li><a href="#wallpapers">Wallpapers</a></li>
+    <li><a href="#mailing">Mailing List for Educators</a></li>
+  </ul>
+  <h3><a href="/activities/ada-zangemann/involved.html">Get Involved</a></h3>
+  <h3><a href="/activities/ada-zangemann/events.html">Events</a></h3>
+  <h3><a href="/activities/ada-zangemann/book-reviews.html">Reviews</a></h3>
+</sidebar>
+<translator/>
+</html>

fsfe.org/activities/android/liberate.en.xhtml

@@ -262,17 +262,6 @@
       GrapheneOS devices.</a>
       </p>
       
-      <div class="color-box border" data-color="burnt-sienna">
-        <p>
-          <a href="https://calyxos.org/news/2025/08/01/a-letter-to-our-community/">
-          CalyxOS development is currently interrupted</a>. 
-          According to their announcement, no further updates, including security patches, 
-          will be released in the foreseeable future until changes have been carried 
-          out within the CalyxOS infrastructure. For those currently running CalyxOS, it has 
-          been advised to back-up your data and switch to a different Android variant.
-        </p>
-      </div>
-      
       <h3 id="CalyxOS">CalyxOS</h3>
       <div class="image left">
       <img alt="calyx-logo" src="/activities/android/calyx-color-logo-150x144.png"/>
@@ -289,6 +278,25 @@
         CalyxOS devices.</a>
 	  </p>
 	  
+	  <h3 id="eos">iodéOS</h3>
+      <div class="image left">
+      <img alt="iodé logo" src="/activities/android/iodeOS.png"/>
+      </div>
+      <p>
+      <a href="https://iode.tech/">iodé</a> is a privacy-focused
+      Android system that aims to remove Google trackers from your
+      smartphone. It is based on LineageOS, so it is compatible with a
+      fairly wide range of devices, and it ships with microG
+      pre-installed. Its distinguishing feature is the built-in iodé
+      blocker, an interface that shows you which trackers and ad
+      servers your apps are trying to contact and lets you block
+      them. Like /e/, it is developed by a European company, and you
+      can also buy smartphones (including refurbished ones) with
+      iodéOS
+      pre-installed. <a href="https://iode.tech/iodeos-official-supported-devices/">List
+      of supported iodé devices</a>.
+      </p>
+
       <h3 id="eos">/e/ OS</h3>
       <div class="image left">
       <img alt="e-logo" src="/activities/android/e-logo.png"/>

fsfe.org/activities/apple-litigation/apple-litigation.en.xhtml

@@ -1,212 +1,323 @@
 <?xml version="1.0" encoding="utf-8"?>
-<html>
-<version>3</version>
+	<html>
+	<version>3</version>
+	
+	<head>
+	  <title>DMA: Litigation against Apple</title>
+	</head>
+	
+	<body class="toplevel">
+	
+	  <h1>DMA: Litigation against Apple</h1>
 
-<head>
-  <title>DMA: Litigation against Apple</title>
-</head>
-
-<body class="toplevel">
-
-  <h1>DMA: Litigation against Apple</h1>
-
-    <div id="introduction">
-      <p>
-      The FSFE is intervening for Free Software in a key court case  
-      involving Apple and the European Commission. Apple is trying to 
-      avoid obligations derived from the Digital Markets Act (DMA). The 
-      FSFE seeks to hold Apple accountable under the DMA in a 
-      developer-friendly way.
-      </p>
-    </div>
-
-    <figure>
-      <img src="https://pics.fsfe.org/uploads/medium/12/97/ab4667655231f8b2ebc20f83c3e0.png" alt="Illustration of an apple with a worm inside it"/>
-      <figcaption>
-        Cutting out the rot in Apple. Graphic by Rahak for the FSFE, <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA 
-        4.0</a>
-      </figcaption>
-    </figure>
-
-
-    <h2>Apple’s unbalanced power is a threat to Free Software</h2>
-
-    <p>Apple is one of the largest tech companies in the world. Its 
-    unbalanced power spans key aspects of software and devices, 
-    profoundly distorting digital markets. Apple’s dominance negatively 
-    affects not only competition with and among other companies, but <a href="/freesoftware/freesoftware.html">software 
-    freedom</a>, open internet and ultimately digital democracy.</p> 
-
-    <p>The <a href="/activities/dma/dma.html">Digital Markets Act (DMA)</a> 
-    is the European Union’s regulatory 
-    response to such corporate power. The law applies to very large 
-    companies exercising “gatekeeper control” in the EU. 
-    The DMA imposes on such companies several obligations, like allowing 
-    the right to install and uninstall software in devices, prohibition 
-    of non-removable pre-installed software, enabling third-party app 
-    stores and access rights via interoperability with software and 
-    hardware functions.</p>
-
-    <p>In September 2023, the European Commission <a href="https://ec.europa.eu/competition/digital_markets_act/cases/202344/DMA_100013_215.pdf">designated 
-    Apple as a 
-    “gatekeeper” under the DMA</a>. With that, the law began to apply to 
-    Apple’s operating system, app store and browser. However, <a href="/news/2024/news-20240627-01.html">Apple has 
-    taken an aggressive position against the DMA, </a> starting litigation 
-    against the European Commission in November 2023.</p>
-
- <div class="module-wrapper news">
-      <module id="banner-apple-litigation-supporter"/>
- </div>
-   
- <p>Due to the high risks against Software Freedom involved in this 
-    case, in February 2024, <strong>the FSFE decided to intervene to hold Apple 
-    accountable under the DMA in a developer-friendly way</strong>. <a href="https://husovec.eu/amicus-briefs/">Dr. 
-    Martin Husovec</a>, a lawyer with extensive experience in strategic 
-    litigation for non-profits, is representing the FSFE before the court.</p>
-<div>
-<blockquote>“Becoming an intervener in this case is crucial as the FSFE is 
-representing the civil society perspective, which enriches the judicial 
-proceedings. This allows the court to make fully informed 
-decisions”<cite>says Dr. Martin Husovec, the lawyer representing FSFE in 
-the 
-court</cite>.</blockquote> 
-</div>
-  
-    <figure>
-      <img src="https://pics.fsfe.org/uploads/big/d0988bf4e317a6cd7953689adf50b573.jpg" alt="Iphone with unlock screen on a desk while a person is bend over it and looks at the phone."/>
-      <figcaption>
-      Barriers against software freedom and vendor lock-in are constant 
-      hurdles faced by developers and users interacting with Apple
-      </figcaption>
-    </figure>
-  
-    <h2>Safeguarding the interests of Free Software developers and users</h2>
-
-    <p>
-    Apple, in this case <a href="https://curia.europa.eu/juris/fiche.jsf?id=T%3B1080%3B23%3BRD%3B1%3BP%3B1%3BT2023%2F1080%2FP&amp;nat=or&amp;mat=or&amp;pcs=Oor&amp;jur=T&amp;for=&amp;jge=&amp;dates=&amp;language=en&amp;pro=&amp;etat=pend&amp;cit=none%252CC%252CCJ%252CR%252C2008E%252C%252C%252C%252C%252C%252C%252C%252C%252C%252Ctrue%252Cfalse%252Cfalse&amp;oqp=&amp;td=%3BALL&amp;avg=&amp;lgrec=en&amp;lg=&amp;cid=4202373">(T-1080/23)</a>, 
-    is trying to dodge the DMA rules over its app store and 
-    interoperability of its operating system. The company’s narrow 
-    interpretation of the DMA frames these obligations as 
-    disproportionate in relation to its commercial and economic 
-    interests.
-    </p> 
-    
-    <p>
-    <strong>The FSFE is countering this position by proving that Apple 
-    is being regulated in the light of public interest</strong>. We 
-    assert that Apple should compete on trustworthiness. Developers and 
-    users should benefit from alternative services and products, not 
-    just those offered by Apple. For reasons of fair competition, 
-    cybersecurity and consumer protection, we urge that the case be 
-    dismissed completely. 
-    </p>
-
-    <p>Here is how your rights will be affected by this litigation if the FSFE is successful:</p>
-
-    <div>
-      <p><strong><em>As a developer:</em></strong></p>
-      <ul>
-        <li>
-        <strong>Access rights:</strong> Software developers will enjoy 
-        less restrictive barriers to access and be able to distribute 
-        their software in environments controlled by Apple;
-        </li>
-        <li>
-        <strong>More software freedom:</strong> Software developers will 
-        be able to demand that Apple allow installation of third party 
-        apps (side-loading), the use of third party app stores and the 
-        uninstallation of pre-installed software in devices;
-        </li> 
-        <li>
-        <strong>Better interoperability policies:</strong> Software 
-        developers will be able to demand effective and free-of-charge 
+	
+	    <div id="introduction">
+	      <p>
+	      The FSFE is intervening in two key court cases 
+	      involving Apple and the European Commission. Apple is seeking to 
+	      avoid obligations derived from the Digital Markets Act (DMA), 
+	      particularly those relating to interoperability. The FSFE seeks to 
+	      hold Apple accountable under the DMA in a developer-friendly way.
+	      </p>
+	    </div>
+	
+	    <figure>
+	      <img src="https://pics.fsfe.org/uploads/original/e8/85/0b0fa1d8e427c9435cbcd11e152d.png" alt="Illustration of an apple with a worm inside it"/>
+	      <figcaption>
+	        Cutting out the rot in Apple. Graphic by Rahak for the FSFE, <a 
+	        href="https://creativecommons.org/licenses/by-sa/4.0/">CC-BY-SA 
+	        4.0</a>
+	      </figcaption>
+	    </figure>
+	
+	
+	  <div class="toc">
+	   <p>Table of contents</p>
+	    <ul>
+      <li><a href="#apple-unbalanced-power">Apple’s unbalanced power is a threat to Free Software</a></li>
+	      <li><a href="#why-matters">Why these cases matter for Software Freedom</a>
+	       <ul>
+	           <li><a href="#rights">Here is how your rights will be 
+	           affected by these cases if the FSFE is 
+	           successful</a></li></ul>
+	      </li>
+	      <li><a href="#help-us">Help us win this legal struggle for Software Freedom!</a> </li>
+	        <li><a href="#timeline">Timeline of the cases</a> </li>
+	    </ul>   
+	  </div>
+	    
+    <h2 id="apple-unbalanced-power">Apple’s unbalanced power is a threat to Free Software</h2>
+	
+	 <p>Apple is one of the largest tech companies in the world. Its 
+	    unbalanced power spans key aspects of software and devices, 
+	    profoundly distorting digital markets.</p>
+	    
+	<p>
+	Apple controls key parts of its digital ecosystem, including operating 
+	systems, app distribution, and access to important device 
+	functionalities. This gives the company significant influence over how 
+	software is developed, distributed, and used on Apple devices.
+	</p>
+	
+	<p>
+	To address such gatekeeper power, the European Union adopted the Digital 
+	Markets Act (DMA) in 2022, granting the European Commission powers to 
+	regulate Apple. In September 2023, the European Commission designated 
+	Apple as a gatekeeper under the DMA. <br/><br/>Since then, Apple has launched several 
+	legal challenges against the law and its implementation at the Court of 
+	Justice of the European Union (CJEU), particularly 
+	regarding interoperability obligations intended to open the company's 
+	ecosystem to greater competition and innovation.
+	</p>
+	      
+	
+	 <div class="module-wrapper news">
+	      <module id="banner-apple-litigation-supporter"/>
+	 </div>
+	
+	<p></p>
+	
+	<p></p>
+	
+	<p>
+	Given the implications for Software Freedom, interoperability and Device 
+	Neutrality, the FSFE decided to apply to intervene and defend the public interest 
+	in open and competitive digital markets, so Apple would be accountable 
+	under the DMA in a developer-friendly way. <br/><br/>The CJEU 
+	recognised the significant impact on Free Software developers and 
+	users, allowing the FSFE to interneve in the case. In the Court's words 
+	" [...] the outcome of the litigation may determine the ability to 
+	interoperate with 
+	Apple's platforms and could influence the supply of Free and Open Source 
+	Software in Europe [...]". <br/>
+	</p>
+	
+	<div>
+	<blockquote>“Becoming an intervener in this case is crucial as the FSFE is 
+	representing the civil society perspective, which enriches the judicial 
+	proceedings. This allows the court to make fully informed 
+	decisions”<cite>says Dr. Martin Husovec, the lawyer representing FSFE in 
+	the 
+	court</cite>.</blockquote> 
+	</div>
+	  
+	    <h2>Safeguarding the interests of Free Software developers and users</h2>
+	
+	    <p>
+	    The FSFE was allowed to intervene in two separate DMA cases brought by 
+	    Apple against the European Commission.
+	    </p> 
+	    
+	<div class="icon-grid one-per-row">
+		      <ul>
+		        <li>
+		           <img src="/graphics/icons/apple-litigation-case108023.png" alt=""/>
+		          <div>
+		            <h3>Case T-1080/23: Apple challenges its status under the DMA </h3>
+		            <p>
+					 In November 2023, <strong>Apple challenged its DMA gatekeeper 
+					 designation</strong>, seeking to have the interoperability-related 
+					 obligations of Article 6(7) DMA inapplicable 
+					 to iOS. The company argues that the interoperability mandate of the DMA is disproportionate 
+					 and incompatible with fundamental rights.</p><p>The company also 
+					 contests the App Store's designation as a core 
+					 platform service and the classification of iMessage 
+					under EU law. </p><p>On 8 July 2026, <strong>in its judgment, the Court 
+					confirmed that Apple remains a gatekeeper under the 
+				DMA</strong>. The Court also dismissed Apple’s attempt to 
+				challenge the DMA’s interoperability obligation in this 
+					case. It ruled that Apple could not use a case about 
+					its gatekeeper designation to attack Article 6(7) 
+					DMA.</p><p><strong>The Court further held that the App Store is 
+					a single service</strong> meant to connect developers with 
+				users, and upheld the DMA’s technology-neutral 
+					approach. For the FSFE, this supports the view that 
+					<strong>mobile devices are general-purpose computing 
+					environments</strong>, not locked appliances, and that 
+					interoperability and Device Neutrality should apply 
+					regardless of brand.
+					</p>       
+		         </div>
+		         </li>	            	            	            	            	            
+	    	
+		        <li>
+		        <img src="/graphics/icons/apple-litigation-case35925.png" alt=""/>
+		          <div> 
+					<h3>Case T-359/25: Apple challenges interoperability under the 
+					DMA</h3> <p>In May 2025, Apple 
+					launched a second action against the European 
+					Commission. This case concerns the Commission's 
+					interoperability specification decision (DMA.100204), 
+					which sets out how Apple must comply with Article 6(7) 
+					DMA in practice.<br/>
+		            <strong>Apple challenges requirements relating to interoperability 
+		            request procedures, timelines, technical access mechanisms</strong> 
+		            and other measures intended to ensure effective 
+		            interoperability for third-party developers.</p>
+		          </div>
+		        </li>
+		   </ul>
+		 </div>
+	   
+	   <h2 id="why-matters">Why these cases matter for Software Freedom</h2>
+	   
+	   <p>
+	   The first case confirmed that Apple remains under the DMA. The second 
+	   case will determine how interoperability obligations work in 
+	   practice.
+	   </p>
+	   <p>
+	   The FSFE supports the European Commission and defends 
+	   interoperability, Software Freedom and Device Neutrality. We argue 
+	   that interoperability obligations serve important public-interest 
+	   objectives, including competition, innovation, cybersecurity, 
+	   consumer choice and the ability of Free Software developers to 
+	   compete on equal terms with proprietary platform providers.
+	   </p>
+	   <p>
+	   We believe that Apple should compete on the merits of its products 
+	   and services rather than through technical restrictions that prevent 
+	   developers and users from accessing alternative solutions. Developers 
+	   and users should be able to benefit from competing services, 
+	   applications and software ecosystems, including Free Software 
+	   alternatives.
+	   </p>
+	   <p>Given all these reasons, we urge that Apple's actions be dismissed.</p>
+	
+	
+	   <h3 id="rights">Here is how your rights will be affected by these cases if the FSFE is successful:</h3>
+	<div class="standout-text-bggreen">
+	    <p><strong><em>As a developer:</em></strong></p>
+	      <ul>
+	        <li>
+	        <strong>Access rights:</strong> Software developers will enjoy 
+	        less restrictive barriers to access and be able to distribute 
+	        their software in environments controlled by Apple;
+	        </li>
+	        <li>
+	        <strong>More software freedom:</strong> Software developers will 
+	        be able to demand that Apple allow installation of third party 
+	        apps (side-loading), the use of third party app stores and the 
+	        uninstallation of pre-installed software in devices;
+	        </li> 
+	        <li>
+	        <strong>Better interoperability policies:</strong> Software 
+	        developers will be able to demand effective and free-of-charge 
         interoperability between their software and Apple’s software and 
         hardware controlled by Apple’s operating system.
-        </li>
-      </ul>
-    </div> 
-  
-    <div>
-      <p><strong>As an user:</strong></p>
-      <ul>
-        <li>
-        <strong>Enhanced freedom of choice:</strong> Users will enjoy 
-        more freedom of choice regarding software on Apple devices. 
-        Users will benefit from more competition and offers from 
-        third-party providers, including alternative app stores, 
-        features and solutions.
-        </li>
-      </ul>
-    </div> 
-  
- <blockquote><a href="https://download.fsfe.org/device-neutrality/fsfe-Intervention-apple-vs-commission-Sep-24-redacted.pdf">Read 
-      our court submission</a>
-    </blockquote>
-  
-    <h2>Help us win this legal struggle for Software Freedom!</h2>
-
-    <figure>
-      <img src="https://pics.fsfe.org/uploads/original/cf/c6/6c33f97f53318757690ee3e4936e.webp" alt="FSFE team and volunteers posing outside the SFSCon venue with a bunch of I love Free Software balloons"/>
-      
-      <figcaption>
-      Apple may have more billions of dollars than FSFE has balloons. 
-      However, such concentrated power should not intimidate us from 
-      defending Software Freedom!
-      </figcaption>
-    </figure>
-
-    <blockquote><em>This case is a pivotal moment in the struggle for Software Freedom.
-      Apple has billions of dollars to hinder proper implementation of the DMA.
-      We say no to restricting the rights and freedoms of Free Software developers and users!
-      <strong>We are the only civil society organisation taking action 
-      in this case</strong>. Our victory depends on your financial 
-      support.
-      We face this risky challenge with courage and determination. Donate to our cause today!</em>
-    </blockquote>
-
-    <p class="text-center">
-      <fsfe-cd-donate-link class="btn btn-lg btn-primary">
-	      I want to donate for Software Freedom!
-      </fsfe-cd-donate-link>
-    </p>
-
-    <h2>Timeline of the case</h2>
-    <ul>
-      <li>
-      <strong>September 2023</strong> - Apple <a href="https://ec.europa.eu/competition/digital_markets_act/cases/202344/DMA_100013_215.pdf">is 
-      designated by the European Commission as a gatekeeper</a> under 
-      the DMA.
-      </li>
-      <li>
-      <strong>November 2023</strong> - Apple <a href="https://eur-lex.europa.eu/legal-content/EN/TXT/PDF/?uri=OJ:C_202400563">appeals 
-      the designation decision</a> to the Court of Justice of the 
-      European Union (CJEU).
-      </li>
-      <li><strong>February 2024</strong> - The FSFE requests to intervene.</li>
-      <li>
-      <strong>August 2024</strong> - The CJEU <a href="/news/2024/news-20240812-01.html">allows the FSFE to 
-      intervene</a> in the case.
-      </li>
-      <li>
-      <strong>September 2024</strong> -  The FSFE <a href="https://download.fsfe.org/device-neutrality/fsfe-Intervention-apple-vs-commission-Sep-24-redacted.pdf">submits 
-      its arguments</a> to the CJEU.
-      </li>
-      
-      <li>
-      <strong>February 2025</strong> - <a href="/activities/apple-litigation/confidentialrequest.html">Court partially dismisses Apple's requests for confidential treatment.</a>
-     </li>
-
- <li>
-      <strong>21 October 2025</strong> - <a href="/news/2025/news-20251021-01.html">Public hearing of the case at the Court of Justice of the European Union in Luxembourg.
-     </a></li>     
-
-
-    </ul>
-  <related-list tag="dma"/>
-
-</body>
-<banner><module id="banner-apple-litigation-supporter"/></banner>
-
-<translator/>
-</html>
-
+	        </li>
+	      </ul>
+	      <p><strong>As an user:</strong></p>
+	      <ul>
+	        <li>
+	        <strong>Enhanced freedom of choice:</strong> Users will enjoy 
+	        more freedom of choice regarding software on Apple devices. 
+	        Users will benefit from more competition and offers from 
+	        third-party providers, including alternative app stores, 
+	        features and solutions.
+	        </li>
+	      </ul>
+	   </div>
+	
+	  
+	    <h2 id="help-us">Help us win this legal struggle for Software Freedom!</h2>
+	
+	      <blockquote>These cases represent a struggle for Software Freedom.
+	      Apple has billions of dollars to hinder proper implementation of the DMA.
+	      We say no to restricting the rights and freedoms of Free Software developers and users!
+	      <strong>We are the only civil society organisation intervening in 
+	      both cases</strong>. Our victory depends on your financial 
+	      support.
+	      We face this risky challenge with courage and determination. Donate to our cause today!
+	    </blockquote>
+	    <figure>
+	      <img src="https://pics.fsfe.org/uploads/original/cf/c6/6c33f97f53318757690ee3e4936e.webp" alt="FSFE team and volunteers posing outside the SFSCon venue with a bunch of I love Free Software balloons"/>
+	      
+	      <figcaption>
+	      Apple may have more billions of dollars than FSFE has balloons. 
+	      However, such concentrated power should not intimidate us from 
+	      defending Software Freedom!
+	      </figcaption>
+	    </figure>
+	
+	    <p class="text-center">
+	      <fsfe-cd-donate-link class="btn btn-lg btn-primary">
+		      I want to donate for Software Freedom!
+	      </fsfe-cd-donate-link>
+	    </p>
+	
+	    <h2 id="timeline">Timeline of the cases</h2>
+	    
+	    
+	       <div class="grid-50-50">
+		      <div class="box">
+		        <p><strong>Case T-1080/23</strong></p>
+		          <ul>
+	      <li>
+	      <strong>September 2023</strong> - Apple <a 
+	      href="https://ec.europa.eu/competition/digital_markets_act/cases/202344/DMA_100013_215.pdf">is 
+	      designated by the European Commission as a gatekeeper</a> under 
+	      the DMA.
+	      </li>
+	      <li>
+	      <strong>November 2023</strong> - Apple <a 
+	      href="https://eur-lex.europa.eu/legal-content/EN/TXT/PDF/?uri=OJ:C_202400563">appeals 
+	      the designation decision</a> to the Court of Justice of the 
+	      European Union (CJEU).
+	      </li>
+	      <li><strong>February 2024</strong> - The FSFE requests to intervene.</li>
+	      <li>
+	      <strong>August 2024</strong> - The CJEU <a 
+	      href="/news/2024/news-20240812-01.html">allows the FSFE to 
+	      intervene</a> in the case.
+	      </li>
+	      <li>
+	      <strong>September 2024</strong> -  The FSFE <a 
+	      href="https://download.fsfe.org/device-neutrality/fsfe-Intervention-apple-vs-commission-Sep-24-redacted.pdf">submits 
+	      its arguments</a> to the CJEU.
+	      </li>
+	      
+	      <li>
+	      <strong>February 2025</strong> - <a 
+	      href="/activities/apple-litigation/confidentialrequest.html">The CJEU 
+	      partially dismisses Apple's requests for confidential 
+	      treatment.</a>
+	     </li>
+	
+	 <li>
+	 <strong>21 October 2025</strong> - <a 
+	 href="/news/2025/news-20251021-01.html">Public hearing of the case at 
+	 the Court of Justice of the European Union in Luxembourg.</a>
+	</li>
+	<li>
+	<strong>8 July 2026</strong> - The General Court, sitting in its Eighth Chamber with 
+		  five judges, <a 
+		  href="https://curia.europa.eu/site/upload/docs/application/pdf/2026-07/cp260096en.pdf">delivers 
+		  judgment dismissing all three of Apple's 
+		  actions</a>.
+		  </li>
+	    </ul>
+		      </div>
+		
+		      <div class="box">
+		        <p><strong>Case T-359/25</strong> (Ongoing)</p>
+		        <ul>
+		          <li><strong>May 2025</strong> - <a href="https://eur-lex.europa.eu/eli/C/2025/5213/oj/eng">Apple appealed the commission specification decision.</a></li>
+	                <li>
+	                <strong>November 2025</strong> - The FSFE requests to intervene.
+	                </li>
+	                <li><strong>May 2026</strong> - The CJEU <a 
+	                href="/news/2026/news-20260519-01.html">allows the FSFE to 
+	      intervene</a> in the case.</li>
+		        </ul>
+		      </div>
+		    </div>
+	
+	 
+	  <related-list tag="dma"/>
+	
+	</body>
+	<banner><module id="banner-apple-litigation-supporter"/></banner>
+	
+	<translator/>
+	</html>

fsfe.org/activities/fsfe25/activity.en.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<activityset>
+  <version>1</version>
+
+  <activity id="fsfe25" date="2026-07-18" status="active">
+    <title>FSFE 25</title>
+    <description>
+	  This year, the FSFE turns 25 and we celebrate it on the 18th and 
+	  19th of July in Kraków. In this activity you will find and overview of 
+	  the agenda of the event, filled with talks, networking, and 
+	  plenty of fun.
+    </description>
+    <link href="/activities/fsfe25/fsfe25.html"/>
+    <image url="/graphics/logos/fsfe25.png"/>
+    <order priority="4" highlight="yes"/>
+    <tags>
+      <tag key="awareness"/>
+    </tags>
+  </activity>
+</activityset>

fsfe.org/activities/fsfe25/fsfe25.en.xhtml

@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="utf-8"?>
+<html>
+  <version>1</version>
+
+  <head>
+    <title>FSFE 25 - Schedule</title>
+  </head>
+  <body class="overview">
+   <h1 class="heading">FSFE 25 - Schedule</h1>
+
+    <div id="introduction">
+      <img class="right" style="width: 200px;" src="https://pics.fsfe.org/uploads/original/c5/1f/4290dac645f0642eba47acd49b14.png" alt="Logo of 25th birthday of the FSFE" />
+      <p>
+		This year, the FSFE turns 25 and we will celebrate it. On 
+		18 and 19 July we will spend the weekend in Kraków 
+		filled with talks, networking, and plenty of fun. Below is the 
+		schedule of all the events taking place over that weekend.
+      </p>
+
+      <p><strong>The weekend talks are part of EuroPython 2026 Sprints, at Echo Miasta (Kapelanka 56, 30-347 Kraków)</strong></p>
+      <p><a href="https://download.fsfe.org/tools/fsfe25.ics">Add the FSFE talks in your calendar</a></p>  
+    </div>
+    
+    <h2>Friday 17 July</h2>
+
+    <table class="table table-responsive colored">
+          <tr>
+            <th class="header-cell">Time</th>
+            <th class="header-cell">Event</th>
+            <th class="header-cell">Speaker</th>
+          </tr>
+          <tr>
+            <td>13:55-14:25</td>
+            <td><a href="https://download.fsfe.org/presentations/20260717-mk-europython-vision-2048.en.pdf">A vision for software freedom in 2048</a> (talk part of the official programme of Europython 2026)</td>
+            <td>Matthias Kirschner</td>
+            </tr>
+          <tr>
+            <td>19:00</td>
+            <td>Warm-up Dinner at Veganic (Karmelicka 34, Krakow, PL 31-128 Kraków)*</td>
+            <td></td>
+          </tr>
+    </table>
+    <small>*Dinner will be "Everyone is responsible for their own expenses"</small>
+
+    <h2>Saturday 18 July</h2>
+    
+    <table class="table table-responsive colored">
+          <tr>
+            <th class="header-cell">Time</th>
+            <th class="header-cell">Session</th>
+            <th class="header-cell">Speaker</th>
+          </tr>
+          <tr>
+            <td>10:00-10:15</td>
+            <td><a href="https://download.fsfe.org/presentations/20260718-01-mk-fsfe25-opening.pdf">Welcome</a></td>
+            <td>Matthias Kirschner</td>
+          </tr>
+          <tr>
+            <td>10:15-10:30</td>
+            <td>25 Years of the FSFE, 60 Years of Star Trek - To Boldly Share Where No One Has Shared Before</td>
+            <td>Florian Snow</td>
+          </tr>
+          <tr>
+            <td>10:30-10:45</td>
+            <td><a href="https://download.fsfe.org/presentations/20260718-03-bernhard-memories-founding-fsfe.pdf">Memories from founding the FSFE</a></td>
+            <td>Bernhard Reiter</td>
+          </tr>
+          <tr>
+            <td>10:45-10:55</td>
+            <td><a href="https://download.fsfe.org/presentations/20260718-04-bonnie-ThankigOthersAtILOVEFS.pdf">Thanking others at ilovefs</a></td>
+            <td>Bonnie Mehring</td>
+          </tr>
+          <tr>
+            <td>10:55-11:05</td>
+            <td><a href="https://download.fsfe.org/presentations/20260718-05-reinhard-Finances.pdf">How a bunch of Python scripts handle FSFE's finances</a></td>
+            <td>Reinhard Müller</td>
+          </tr>
+          <tr>
+            <td>11:05-11:15</td>
+            <td>From becoming contributor to do my first talk for the FSFE</td>
+            <td>Fiona Ebner</td>
+          </tr>
+          <tr>
+            <td>11:15-11:25</td>
+            <td><a href="https://download.fsfe.org/presentations/20260718-07-tobiasd-RunningANGOEmboweredWithSoftwareFreedom.pdf">Running a NGO empowered with Software Freedom</a></td>
+            <td>Tobias Diekershoff</td>
+          </tr>
+          <tr>
+            <td>11:25-11:35</td>
+            <td><a href="https://download.fsfe.org/presentations/20260718-08-marta-ItalianActicities.pdf">From Italian activities to setting up a legal entity</a></td>
+            <td>Marta Andreoli</td>
+          </tr>
+          <tr class="row-highlight">
+            <td>11:35-11:55</td>
+            <td>Break</td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>11:50-12:00</td>
+            <td><a href="https://download.fsfe.org/presentations/20260718-09-jn-pmpc.pdf">Next steps for Public Money? Public Code!</a></td>
+            <td>Johannes Näder</td>
+          </tr>
+          <tr>
+            <td>12:00-12:15</td>
+            <td>FSFE and SFC: Collaboration FTW</td>
+            <td>Karen M. Sandler</td>
+          </tr>
+          <tr>
+            <td>12:15-12:35</td>
+            <td>Why companies support the FSFE? Words from our donors</td>
+            <td>FSFE Donors / Sponsors</td>
+          </tr>
+          <tr class="row-highlight">
+            <td>12:35-14:00</td>
+            <td>Networking time (Lunch Break)</td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>14:00-14:10</td>
+            <td><a href="https://download.fsfe.org/presentations/20260718-12-franz-veganApproach.pdf">Reaching new audiences – The “Vegan Approach”</a></td>
+            <td>Franz Gratzer</td>
+          </tr>
+          <tr>
+            <td>14:10-14:20</td>
+            <td><a href="https://download.fsfe.org/presentations/20260718-13-maurice-nico-fsfeNL25.pdf">Over 15 years of the Dutch Team</a></td>
+            <td>Maurice Verheesen and Nico Rikken</td>
+          </tr>
+          <tr>
+            <td>14:20-14:35</td>
+            <td><a href="https://download.fsfe.org/presentations/20260718-14-emanuele-lorenzo-FSFEHighSchools.pdf">Rediscovering the value of (software) freedom: experiences from Italian high schools</a></td>
+            <td>Emanuele Solferino and Lorenzo Lin</td>
+          </tr>
+          <tr>
+            <td>14:35-15:00</td>
+            <td><a href="https://download.fsfe.org/presentations/20260718-15-mk-fsfe25-award-time.pdf">Award time – Highlighting FSFE contributors</a></td>
+            <td>Ana Galán and Matthias Kirschner</td>
+          </tr>
+          <tr>
+            <td>15:00-15:15</td>
+            <td><a href="https://download.fsfe.org/presentations/20260718-16-karsten-WhatSoftwareFreedomMeansToday.pdf">What software freedom means today</a>**</td>
+            <td>Karsten Gerloff</td>
+          </tr>
+          <tr>
+            <td>15:15-16:15</td>
+            <td>Software Freedom Improtheater</td>
+            <td></td>
+          </tr>
+          <tr class="row-highlight">
+            <td>17:00-19:00</td>
+            <td>Dinner at Hamsa (Szeroka 2, 31-053 Kraków)*</td>
+            <td></td>
+          </tr>
+          <tr class="row-highlight">
+            <td>20:00</td>
+            <td>"The FSFE is turning 25!" - Community Meeting. At Stara Zajezdnia ( ul. Św. Wawrzyńca 12, 31-060 Kraków)</td>
+            <td></td>
+          </tr>     
+    </table>
+    <small>*Dinner will be "Everyone is responsible for their own expenses"</small><br />
+    <small>**<a href="https://slothrop.org/2026/07/20/what-software-freedom-means-today">Check out Karsten's blog entry about his talk for a depth insight</a> </small>
+
+   
+    <h2>Sunday 19 July</h2>
+    
+    <table class="table table-responsive colored">
+          <tr>
+            <th class="header-cell">Time</th>
+            <th class="header-cell">Session</th>
+            <th class="header-cell">Speaker</th>
+          </tr>
+          <tr>
+            <td>10:00-10:15</td>
+            <td><a href="https://download.fsfe.org/presentations/20260719-01-patrick-LocalGroupFunding.pdf">How to get funding for your local group project</a></td>
+            <td>Patrick Ohnewein</td>
+          </tr>
+          <tr>
+            <td>10:15-10:25</td>
+            <td><a href="https://download.fsfe.org/presentations/20260719-02-delliot-WebsiteTalk.pdf">Engaging with FSFE’s website, plans for the future</a></td>
+            <td>Darragh Elliott</td>
+          </tr>
+          <tr>
+            <td>10:25-10:35</td>
+            <td><a href="https://download.fsfe.org/presentations/20260719-03-nica-TeufelMyndAnalysis.pdf">Let’s dance - Teufel Mynd Analysis</a></td>
+            <td>Nicole Faerber</td>
+          </tr>
+          <tr>
+            <td>10:35-10:45</td>
+            <td><a href="https://download.fsfe.org/presentations/20260719-04-LucaB-Refund4Freedom-EffortsToScaleOwnEfforts.pdf">Refund 4 Freedom – Efforts to scale own efforts</a></td>
+            <td>Luca Bonissi</td>
+          </tr>
+          <tr>
+            <td>10:45-11:15</td>
+            <td>Non-Free Software Licenses: Restrictions on the Freedom to Use - Fishbowl discussion</td>
+            <td>Gabriel Ku Wei Bin and Bonnie Mehring</td>
+          </tr>
+          <tr class="row-highlight">
+            <td>11:15-11:35</td>
+            <td>Break</td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>11:35-11:50</td>
+            <td><a href="https://download.fsfe.org/presentations/20260719-06-jithendra-DMA_StatusAppleVsFSFE.pdf">DMA – Status Apple vs FSFE</a></td>
+            <td>Jithendra Palepu</td>
+          </tr>
+          <tr>
+            <td>11:50-12:00</td>
+            <td><a href="https://download.fsfe.org/presentations/20260719-07-annarita.russo-ReverseEngineeringAgeOfAI.pdf">Reverse Engineering in the Age of Artificial Intelligence</a></td>
+            <td>Anna Rita Russo</td>
+          </tr>
+          <tr>
+            <td>12:00-1>2:10</td>
+            <td><a href="https://download.fsfe.org/presentations/20260719-08-alexander.pitsch-ZurichGroup.pdf">Highlights from the Swiss team</a></td>
+            <td>Alexander Pitsch</td>
+          </tr>
+          <tr>
+            <td>12:10-12:20</td>
+            <td>Status and plans of the Polish Team</td>
+            <td>Damian Fajfer</td>
+          </tr>
+          <tr>
+            <td>12:20-12:30</td>
+            <td><a href="https://download.fsfe.org/presentations/20260719-10-nico-AdaZangemannAutomation.pdf">Ada &amp; Zangemann Automation Status and Future</a></td>
+            <td>Nico Rikken</td>
+          </tr>
+          <tr>
+            <td>12:30-12:40</td>
+            <td><a href="https://download.fsfe.org/presentations/20260719-11-sofiaritz-FromYH4FToInteroperabilityEuropeAct.pdf">From Winning YH4F to monitoring the Interoperable Europe Act</a></td>
+            <td>Sofía Aritz</td>
+          </tr>
+          <tr>
+            <td>12:40-12:50</td>
+            <td><a href="https://download.fsfe.org/presentations/20260719-12-giaccomo-IEEwtYG.pdf">Italian experiences engaging with the Young Generation</a></td>
+            <td>Giacomo Alessandroni</td>
+          </tr>
+          <tr>
+            <td>12:50-13:00</td>
+            <td>Closing</td>
+            <td>Matthias Kirschner</td>
+          </tr>
+    </table>
+  </body>
+  
+<translator/>
+</html>
+

fsfe.org/cgi-bin/registerbooth.php

@@ -0,0 +1,115 @@
+<?php
+function send_email ($name, $email, $experience, $material, $eventdescription, $city, $country, $startdate, $people, $language, $package, $address, $notes, $personalinfo) {
+    $url = 'https://helpdesk.fsfe.org/api/conversations';
+    $apikey = getenv('FREESCOUT_API_KEY');
+    $subject = "Booth request from " . $name . " - " . $city;
+    
+    // Email to the person who filled the form
+    $mailcustomer = "<html><body><p>Dear " . $name . ",</p>";
+    $mailcustomer .= "<p>thank you for your booth request for the event in " . $city . ". We will review your request and get back to you as soon as possible.</p>";
+    $mailcustomer .= "<p>Best,<br/>The FSFE Team</p></body></html>";
+    
+    // Internal note with all the submitted details
+    $mailbody = "<html><body><p>Hello,</p><p>" . $name . " has submitted a new booth request.</p>";
+    $mailbody .= "<p>Please check the following details:<br/>";
+    $mailbody .= "Email: " . $email . "<br/>";
+    $mailbody .= "Organised a booth before: " . $experience . "<br/>";
+    $mailbody .= "Material requested: " . $material . "<br/>";
+    $mailbody .= "Event description: " . $eventdescription . "<br/>";
+    $mailbody .= "City: " . $city . "<br/>";
+    $mailbody .= "Country: " . $country . "<br/>";
+    $mailbody .= "Start date: " . $startdate . "<br/>";
+    $mailbody .= "Expected attendance: " . $people . "<br/>";
+    $mailbody .= "Preferred language(s): " . $language . "<br/>";
+    $mailbody .= "Package size: " . $package . "<br/>";
+    $mailbody .= "Shipping address: " . $address . "<br/>";
+    $mailbody .= "Additional notes: " . $notes . "<br/>";
+    $mailbody .= "Personal background: " . $personalinfo . "</p>";
+    $jsondata = [
+        'type' => 'email',
+        'mailboxId' => 7, 
+        'subject' => $subject,
+        'customer' => [
+            'email' => $email,
+            'firstName' => $name,
+        ],
+        'threads' => [
+            [
+                'text' => $mailcustomer,
+                'type' => 'message',
+                'user' => 6530,
+            ],
+            [
+                'text' => $mailbody,
+                'type' => 'note',
+                'user' => 6584,
+            ],
+        ],
+        'imported' => false,
+        'assignTo' => 6584,
+        'status' => 'active',
+    ];
+    $jsonDataEncoded = json_encode($jsondata);
+
+    $curl = curl_init();
+    curl_setopt_array($curl, [
+        CURLOPT_RETURNTRANSFER => 1,
+        CURLOPT_URL => $url,
+        CURLOPT_POST => 1,
+        CURLOPT_CUSTOMREQUEST => 'POST',
+        CURLOPT_POSTFIELDS => $jsonDataEncoded,
+        CURLOPT_HTTPHEADER => [
+            'Content-Type: application/json',
+            'Content-Length: '.strlen($jsonDataEncoded),
+            'X-FreeScout-API-Key: '.$apikey,
+        ],
+        CURLOPT_USERAGENT => 'FSFE registerbooth.php',
+    ]);
+    $response = curl_exec($curl);
+    curl_close($curl);
+    return $response;
+}
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+  // sanity check URL is not set
+  if (!empty($_POST["url"])) {
+    die("The supplied data is incorrect. Please use the back button of the browser to return to the form.");
+  }
+  // sanity check all the needed fields are set
+  if (
+        empty($_POST["name"]) ||
+        empty($_POST["email"]) ||
+        empty($_POST["experience"]) ||
+        empty($_POST["material"]) ||
+        empty($_POST["eventdescription"]) ||
+        empty($_POST["city"]) ||
+        empty($_POST["country"]) ||
+        empty($_POST["startdate"]) ||
+        empty($_POST["people"]) ||
+        empty($_POST["language"]) ||
+        empty($_POST["package"]) ||
+        empty($_POST["address"])
+    ) {
+    die("The supplied data is incorrect. Please use the back button of the browser to return to the form.");
+  }
+  $lang = substr($_POST['language'], 0, 2);
+  $email_response = send_email(
+    htmlspecialchars($_POST["name"]),
+        htmlspecialchars($_POST["email"]),
+        htmlspecialchars($_POST["experience"]),
+        htmlspecialchars($_POST["material"]),
+        htmlspecialchars($_POST["eventdescription"]),
+        htmlspecialchars($_POST["city"]),
+        htmlspecialchars($_POST["country"]),
+        htmlspecialchars($_POST["startdate"]),
+        htmlspecialchars($_POST["people"]),
+        htmlspecialchars($_POST["language"]),
+        htmlspecialchars($_POST["package"]),
+        htmlspecialchars($_POST["address"]),
+        htmlspecialchars($_POST["notes"] ?? ''),
+        htmlspecialchars($_POST["personalinfo"] ?? '')
+  );
+  header("Location: https://fsfe.org/events/tools/boothregistration.html");
+} else {
+    die("An error occured.");
+}

fsfe.org/contribute/promoitems/active-items.en.xml

@@ -101,9 +101,6 @@ Such an item doesn't need an image!
     <image imgsmall="/contribute/promopics/ua_poster_thumb.png"/>
   </item>
 
-  <item type="upcyclingandroid" id="ua-leaflet" year="2023" order="4">
-    <image imgsmall="/contribute/promopics/ua_leaflet_thumb.png"/>
-  </item>
 
   <!-- F-droid -->
 
@@ -183,12 +180,6 @@ Such an item doesn't need an image!
     <image imgsmall="/contribute/promopics/deviceneutrality-sticker-thumb.png"/>
   </item>
 
-  <!-- Fedigov -->
-
-  <item type="fedigov" id="fedigov-sticker" year="2023" order="1">
-    <image imgsmall="/contribute/promopics/fedigov-sticker-thumb.jpg"/>
-  </item>
-  
   <!-- Youth Hacking 4 Freedom -->
 
   <item type="yh4f" id="yh4f-logo-sticker" year="2023" order="1">

fsfe.org/contribute/promoitems/archived-items.en.xml

@@ -173,6 +173,11 @@ to every item in this file -->
     <image imgsmall="/contribute/promopics/ua-sticker-square-thumb.jpg"/>
   </item>
 
+  <item type="upcyclingandroid" id="ua-leaflet" year="2023" order="4">
+    <image imgsmall="/contribute/promopics/ua_leaflet_thumb.png"/>
+  </item>
+
+
   <!-- Children's Book Ada+Zangemann -->
 
 
@@ -188,4 +193,10 @@ to every item in this file -->
     <image imgsmall="/contribute/promopics/dontwreckourtech-sticker-thumb.jpg"/>
   </item>
 
+  <!-- Fedigov -->    
+
+<item type="fedigov" id="fedigov-sticker" year="2023" order="1">
+    <image imgsmall="/contribute/promopics/fedigov-sticker-thumb.jpg"/>
+  </item>
+
 </itemset>

fsfe.org/contribute/spreadtheword.en.xhtml

@@ -49,7 +49,7 @@
       </ul>
       <p>Prepare a Community Event</p>
       <ul>
-        <li><a href="https://share.fsfe.org/apps/forms/s/Sk2teQXqccbDxcWWW3RKECMq">Booth preparation form</a></li>
+        <li><a href="/events/tools/boothregistration.html">Booth preparation form</a></li>
       </ul>
     </div>
 
@@ -60,7 +60,7 @@
   
     <p>
       If you are taking part in a larger event and need material about the FSFE and our activities, please
-      <a href="https://share.fsfe.org/apps/forms/s/Sk2teQXqccbDxcWWW3RKECMq">fill out the booth/event preparation form</a>
+      <a href="/events/tools/boothregistration.html">fill out the booth/event preparation form</a>
       and let us know about it! 
     </p>
 

fsfe.org/contribute/spreadtheword.it.xhtml

@@ -45,7 +45,7 @@
       </ul>
       <p>Prepara un evento di comunità</p>
       <ul>
-        <li><a href="https://share.fsfe.org/apps/forms/s/Sk2teQXqccbDxcWWW3RKECMq">Modulo di preparazione dei booth</a></li>
+        <li><a href="/events/tools/boothregistration.html">Modulo di preparazione dei booth</a></li>
       </ul>
     </div>
 
@@ -76,7 +76,7 @@
   
     <p>
       Se hai bisogno di materiale a proposito della FSFE e delle nostre attività per il tuo evento, per favore
-      <a href="https://share.fsfe.org/apps/forms/s/Sk2teQXqccbDxcWWW3RKECMq">compila il modulo per la prepazione dei booth</a>
+      <a href="/events/tools/boothregistration.html">compila il modulo per la prepazione dei booth</a>
       e faccelo sapere! 
     </p>
 

fsfe.org/donate/donors/donors-2019.en.xml

@@ -49,6 +49,7 @@
     <donor>Casper Freksen</donor>
     <donor>Christian Wasserthal</donor>
     <donor>ctrl.alt.coop</donor>
+    <donor>Ericsson</donor>
     <donor>Florian Snow</donor>
     <donor>Florian Westphal</donor>
     <donor>foo.li systeme + software</donor>

fsfe.org/donate/donors/donors-2020.en.xml

@@ -52,6 +52,7 @@
     <donor>ctrl.alt.coop</donor>
     <donor date="2020-05-19">The Document Foundation</donor>
     <donor>Dr. Herbert Consult GmbH<!-- "GmbH" suffix explicitly requested --></donor>
+    <donor>Ericsson</donor>
     <donor>Florian Westphal</donor>
     <donor>foo.li systeme + software</donor>
     <donor>Guido Maria Serra (whitehat.berlin)</donor>

fsfe.org/donate/donors/donors-2024.en.xml

@@ -31,6 +31,7 @@
     <donor date="2024-07-25" img="donors/silver-avm.png">AVM</donor>
     <donor date="2024-06-07" img="donors/silver-collabora.png">Collabora Productivity</donor>
     <donor date="2024-06-11" img="donors/silver-libreoffice.jpg">Document Foundation</donor>
+    <donor date="2024-04-25" img="donors/silver-ericsson.png">Ericsson</donor>
     <donor date="2024-12-19" img="donors/silver-freiheit.png">freiheit.com technologies</donor>
     <donor date="2024-12-03" img="donors/silver-heinlein-support.png">Heinlein Support</donor>
     <donor date="2024-12-23" img="donors/silver-intevation-new.png">Intevation GmbH</donor>

fsfe.org/donate/donors/donors-2026.en.xml

@@ -21,6 +21,7 @@
     <!-- 300 per month or 3,600 in this year -->
     <!-- Sorted by name, with smaller image (width x height ca. 5.000) -->
     <donor img="donors/silver-bosch.png">Bosch</donor>
+    <donor img="donors/silver-ericsson.png">Ericsson</donor>
     <donor img="donors/silver-google.png" amount="4,000" since="2007">Google</donor>
     <donor img="donors/silver-heinlein-support.png" since="2014">Heinlein Support</donor>
     <donor img="donors/silver-intevation-new.png" since="2009">Intevation GmbH</donor>
@@ -51,6 +52,7 @@
     <donor since="2016">Holger Kienle</donor>
     <donor since="2003">Hostsharing eG</donor>
     <donor since="2004">inmedias.it</donor>
+    <donor>Jeppe Winther</donor>
     <donor>KIX</donor>
     <donor>Liferay International</donor>
     <donor since="2009">LIHAS - LinuxHaus Stuttgart</donor><!-- Adrian Reyer -->
@@ -61,5 +63,6 @@
     <donor>SUSE</donor>
     <donor>SUSE Open Source Network</donor>
     <donor since="2014">Thomas Doczkal</donor>
+    <donor>Thomas Lötzer</donor>
   </category3>
 </donorset>

fsfe.org/events/2026/event-20260709-03.en.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<eventset>
+  <version>1</version>
+  <event start="2026-07-09T16:00:00Z" end="2026-07-09T18:00:00Z">
+        <title>FSFE Zurich local group meeting  (online)</title>
+    <group>
+     <name>Zurich</name> 
+     <url></url>
+    </group>
+
+    <body>
+      <p>We will discuss the topics outlined in our agenda. You&#039;re very welcome to join us!</p>
+    </body>
+
+    <link>https://docs.fsfe.org/en/LocalGroups/Active/Zurich/Monatstreffen/2026-07-09</link>
+    <tags>
+            <tag key="localgroup"/>
+      <tag key="front-page"/>
+    </tags>
+  </event>
+</eventset>

fsfe.org/events/2026/event-20260713-01.en.xml

@@ -2,7 +2,7 @@
 <eventset>
   <version>1</version>
   <event start="2026-07-13T11:00:00Z" end="2026-07-17T19:00:00Z">
-        <title>The FSFE at Europython 2026 in Krakow in Krakow, Germany</title>
+        <title>The FSFE at Europython 2026 in Krakow, Poland</title>
     <group>
      <name>None</name> 
      <url></url>

fsfe.org/events/2026/event-20260713-02.en.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<eventset>
+  <version>1</version>
+  <event start="2026-07-13T17:00:00Z" end="2026-07-13T21:00:00Z">
+        <title>FSFE Community Meeting in Bonn, Germany</title>
+    <group>
+     <name>Bonn</name> 
+     <url></url>
+    </group>
+
+    <body>
+      <p>We are a group of Free Software enthusiasts who meet in Bonn once a month to share ideas and talk about our experience related to Free Software (also known as Open Source).</p>
+     <p>Everyone is welcome to join! Our Bonn FSFE community meetings usually take place at 7 PM (CET) every second Monday of the month. We currently meet at bitcircus101, Dorotheenstraße 101, 53113 Bonn</p>
+    </body>
+
+    <link>https://docs.fsfe.org/en/LocalGroups/Active/Bonn</link>
+    <tags>
+            <tag key="de">
+          Germany      </tag>
+            <tag key="localgroup"/>
+      <tag key="front-page"/>
+    </tags>
+  </event>
+</eventset>

fsfe.org/events/2026/event-20260717-01.en.xml

@@ -9,18 +9,25 @@
     </group>
 
     <body>
-      <p>This year, we&#039;re blowing out 25 candles — and we want to celebrate with you! Join us for a weekend in Kraków filled with talks, networking, and plenty of fun.<br />
-**Friday, 17 July — Warm-up dinner**<br />
-Arriving early? Kick off the weekend with an unofficial dinner and a relaxed evening of networking with fellow attendees.<br />
-**Saturday, 18 July — Main celebrations**<br />
+      <p>This year, we&#039;re blowing out 25 candles — and we want to celebrate with you! Join us for a weekend in Kraków filled with talks, networking, and plenty of fun.<br /></p>
+<p>**Friday, 17 July — Warm-up dinner**<br />
+Arriving early? Kick off the weekend with an unofficial dinner and a relaxed evening of networking with fellow attendees. We will meet at 7pm at a restaurant
+in the city center: Veganic (Karmelicka 34, Krakow, PL 31-128 Kraków).
+Dinner will be "Everyone is responsible for their own expenses".<br /></p>
+<p>**Saturday, 18 July — Main celebrations**<br />
 We&#039;ll be at the EuroPython sprints with a packed room of talks exploring the FSFE&#039;s past, present and future. To close out the day, we&#039;ll shake things up with an improv theatre session before heading out for the real celebrations!<br />
 That evening, we will raise a glass together with our community. If you care about software freedom, you belong with us, come and celebrate!<br />
-**Sunday, 19 July — There is always a  farewell**<br />
+Before the FSFE25 official gathering, you are welcome to join us for dinner from 5pm to 7pm at: Hamsa (Szeroka 2, 31-053 Kraków). Dinner will be "Everyone is responsible for their own expenses".<br />
+From 8pm, everyone is invited to celebrate with us our 25 anniversary at the FSFE 25 Party:
+Stara Zajezdnia ( ul. Św. Wawrzyńca 12, 31-060 Kraków).<br /></p>
+<p>**Sunday, 19 July — There is always a  farewell**<br />
 We will reconvene at the EuroPython sprint for more talks until lunchtime, when we&#039;ll say our goodbyes... unless you&#039;re sticking around until Monday! If so, join us for a relaxed social evening to wrap up the weekend.</p>
      <p>Europython Sprint venue:  ECHOmiasta (Kapelanka 56, 30-347 Kraków). <br />
 FSFE 25 Party venue: Stara Zajezdnia ( ul. Św. Wawrzyńca 12, 31-060 Kraków)<br />
 </p>
     </body>
+      
+    <link>https://fsfe.org/about/summermeeting-schedule.en.html</link>
 
     
     <tags>

fsfe.org/events/2026/event-20260720-01.en.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<eventset>
+  <version>1</version>
+  <event start="2026-07-20T18:00:00Z" end="2026-07-20T20:00:00Z">
+        <title>FSFE Women (online)</title>
+    <group>
+     <name>FSFE Women</name> 
+     <url></url>
+    </group>
+
+    <body>
+      <p>We are a group for women* who are interested in Free Software. Once a month we meet to talk about Free Software and women* in the tech. Together we learn about Free Software and related topics that we care about and discuss recent developments.</p>
+     <p>The group is women-centric and open to all women*, inter, trans and non-binary people.</p>
+    </body>
+
+    <link>https://docs.fsfe.org/en/teams/Women</link>
+    <tags>
+            <tag key="meeting"/>
+      <tag key="front-page"/>
+    </tags>
+  </event>
+</eventset>

fsfe.org/events/2026/event-20260813-01.en.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<eventset>
+  <version>1</version>
+  <event start="2026-08-13T16:00:00Z" end="2026-08-13T18:00:00Z">
+        <title>FSFE Zurich local group meeting in Zurich, Switzerland</title>
+    <group>
+     <name>Zurich</name> 
+     <url></url>
+    </group>
+
+    <body>
+      <p>We will discuss the topics outlined in our agenda. You&#039;re very welcome to join us!</p>
+    </body>
+
+    <link>https://docs.fsfe.org/en/LocalGroups/Active/Zurich/Monatstreffen/2026-08-13</link>
+    <tags>
+            <tag key="ch">
+          Switzerland      </tag>
+            <tag key="localgroup"/>
+      <tag key="front-page"/>
+    </tags>
+  </event>
+</eventset>

fsfe.org/events/2026/event-20260813-02.de.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<eventset>
+  <version>1</version>
+  <event start="2026-08-13T16:00:00Z" end="2026-08-13T18:00:00Z">
+        <title>Treffen der lokalen Gruppe Berlin in Berlin, Germany</title>
+    <group>
+     <name>Berlin</name> 
+     <url></url>
+    </group>
+
+    <body>
+      <p>Die Berliner Gruppe der FSFE trifft sich jeden 2. Donnerstag im Monat um 18 Uhr im Kieztreff Undine (Hagenstraße 57, 5 Minuten vom U+S Bahnhof Lichtenberg). Jede*r an Freier Software Interessierte ist bei den Treffen willkommen. </p>
+    </body>
+
+    
+    <tags>
+            <tag key="de">
+          Germany      </tag>
+            <tag key="localgroup"/>
+<tag key="meeting"/>
+      <tag key="front-page"/>
+    </tags>
+  </event>
+</eventset>

fsfe.org/events/2026/event-20260813-02.en.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<eventset>
+  <version>1</version>
+  <event start="2026-08-13T16:00:00Z" end="2026-08-13T18:00:00Z">
+        <title>FSFE Berlin local group meeting in Berlin, Germany</title>
+    <group>
+     <name>Berlin</name> 
+     <url></url>
+    </group>
+
+    <body>
+      <p>The Berlin group of FSFE supporters is meeting at Kieztreff Undine (Hagenstraße 57 Berlin (S/U Bhf Lichtenberg)) to prepare the events for the rest of the year and chat about current Free Software related topics. The meeting will start at 18h in Berlin, the main language spoken will likely be German.</p>
+    </body>
+
+    
+    <tags>
+            <tag key="de">
+          Germany      </tag>
+            <tag key="localgroup"/>
+<tag key="meeting"/>
+      <tag key="front-page"/>
+    </tags>
+  </event>
+</eventset>

fsfe.org/events/2026/event-20260815-01.en.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<eventset>
+  <version>1</version>
+  <event start="2026-08-15T08:30:00Z" end="2026-08-16T14:30:00Z">
+        <title>Join the FSFE at FrOSCon 2026! in Sankt Agustin, Germany</title>
+    <group>
+     <name>Germany</name> 
+     <url></url>
+    </group>
+
+    <body>
+      <p>One more time, the FSFE is attending the  Free and Open Source Software Conference in Sankt Augstin (Germany) at the Hochschule Bonn-Rhein-Sieg.</p>
+     <p>FSFE&#039;s staff and volunteers will be spending the weekend with a booth full of our merchandise, stickers, and info material and ready to answer all your questions about our work, how to collaborate with us.... </p>
+     <p>Do not miss our talks! <p/>
+     <ul>
+        <li>Alexander Sander, our Policy Consultant, will talk together with Michael Schuster about &quot;Free Software and the Cyber Resilience Act&quot;.<br />
+15.08.2026 13:45–14:45, HS 7 </li>
+         <li> Johannes Näder, FSFE&#039;s Programme Manager, will take us through the concept of Openwashing and what we can do about these practices in his talk &quot;Openwashing ans Licht!&quot;<br />
+16.08.2026 10:00–11:00, HS 4</li>
+         <li>Florian Snow, FSFE staff and volunteer, will  explain what  do the United Federation of Planets and the Free Software Foundation Europe have in common? In his talk &quot;To Boldly Share Where No One Has Shared Before&quot;<br />
+16.08.2026 15:00–16:00, HS 6 </li>
+    </ul>    
+
+</p>
+    </body>
+
+    <link>https://froscon.org/</link>
+    <tags>
+            <tag key="de">
+          Germany      </tag>
+            <tag key="talk"/>
+<tag key="infobooth"/>
+      <tag key="front-page"/>
+    </tags>
+  </event>
+</eventset>

fsfe.org/events/2026/event-20260826-01.en.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<eventset>
+  <version>1</version>
+  <event start="2026-08-26T18:00:00Z" end="2026-08-26T20:00:00Z">
+        <title>FSFE Netherlands online get-together (online)</title>
+    <group>
+     <name>Netherlands</name> 
+     <url></url>
+    </group>
+
+    <body>
+      <p>FSFE Netherlands meets every month online to discuss relevant news, practical challenges and opportunities for software freedom and actions to improve the situation. Current topics are digital autonomy, Ada &amp; Zangemann book translation and banking apps.</p>
+     <p>We meet from 20:00 CEST until about 22:00 CEST. The meeting will be in English if not all participants speak Dutch. More details of can be found on the wiki page of this event. Minutes of previous meetings are also available on the wiki.</p>
+    </body>
+
+    <link>https://docs.fsfe.org/en/LocalGroups/Active/Nederland/Events/2026-08-26</link>
+    <tags>
+            <tag key="localgroup"/>
+<tag key="meeting"/>
+      <tag key="front-page"/>
+    </tags>
+  </event>
+</eventset>

fsfe.org/events/2026/event-20260826-01.nl.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<eventset>
+  <version>1</version>
+  <event start="2026-08-26T18:00:00Z" end="2026-08-26T20:00:00Z">
+        <title>FSFE Nederland online get-together (online)</title>
+    <group>
+     <name>Netherlands</name> 
+     <url></url>
+    </group>
+
+    <body>
+      <p>FSFE Nederland komt maandelijks online samen om relevant nieuws te bespreken, als ook praktische uitdagingen en kansen voor vrije software en acties om de situatie te verbeteren. Actuele onderwerpen zijn digitale autonomie, de Ada &amp; Zangemann boekvertaling en apps van banken.</p>
+     <p>We ontmoeten om 20:00 CEST tot ongeveer 22:00 CEST. De bijeenkomst zal in het Engels zijn als niet alle aanwezigen Nederlands spreken. Meer details zijn te lezen op de wiki-pagina van het evenement. Notulen van vorige bijeenkomsten zijn ook beschikbaar op de wiki.</p>
+    </body>
+
+    <link>https://docs.fsfe.org/en/LocalGroups/Active/Nederland/Events/2026-08-26</link>
+    <tags>
+            <tag key="localgroup"/>
+<tag key="meeting"/>
+      <tag key="front-page"/>
+    </tags>
+  </event>
+</eventset>

fsfe.org/events/2026/event-20260911-01.en.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<eventset>
+  <version>1</version>
+  <event start="2026-09-11T08:00:00Z" end="2026-09-12T22:00:00Z">
+        <title>LibreOffice Conference in Pordenone, Italia</title>
+    <group>
+     <name>None</name> 
+     <url></url>
+    </group>
+
+    <body>
+      <p>LibreOffice Conference 2026: an information booth open to everyone on Saturday, September 12.</p>
+     <p>The booth will be an opportunity to learn more about the FSFE, discover its activities in Italy and across Europe, discuss Free Software, and meet volunteers to learn how to contribute to a freer, more open, and sustainable digital ecosystem. Informational materials will be available, and visitors will have the opportunity to ask questions about the Foundation&#039;s initiatives and local communities.</p>
+     <p>During the conference, a talk proposal entitled &quot;Growing Local Free Software Communities&quot; has also been submitted. The talk will focus on the role of local communities in promoting Free Software, highlighting how Linux User Groups, associations, schools, and volunteers can work together to build active communities, engage new contributors, and spread the culture of Free Software through events, education, and local initiatives.</p>
+     <p>The FSFE booth is open to everyone, and no additional registration is required beyond the conference registration.</p>
+    </body>
+
+    <link>https://conference.libreoffice.org/</link>
+    <tags>
+            <tag key="it">
+          Italia      </tag>
+            <tag key="talk"/>
+<tag key="infobooth"/>
+      <tag key="front-page"/>
+    </tags>
+  </event>
+</eventset>

fsfe.org/events/2026/event-20260911-01.it.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<eventset>
+  <version>1</version>
+  <event start="2026-09-11T08:00:00Z" end="2026-09-12T22:00:00Z">
+    <title>LibreOffice Conference in Pordenone, Italia</title>
+    <group>
+     <name>None</name> 
+     <url></url>
+    </group>
+
+    <body>
+      <p>LibreOffice Conference Italia 2026: stand informativo aperto a tutti nella giornata di sabato 12 settembre.</p>
+     <p>Lo stand sarà l&#039;occasione per conoscere da vicino la FSFE, scoprire le sue attività in Italia e in Europa, parlare di Software Libero e confrontarsi con i volontari su come contribuire alla diffusione di un ecosistema digitale più libero, aperto e sostenibile. Saranno inoltre disponibili materiali informativi e sarà possibile fare domande sulle iniziative della fondazione e sulle comunità locali.</p>
+     <p>Durante la conferenza è inoltre prevista la proposta di un talk intitolato &quot;Growing Local Free Software Communities&quot;, dedicato al ruolo delle comunità locali nella promozione del Software Libero. L&#039;intervento racconterà come FSFE, associazioni, scuole e volontari possano collaborare per creare comunità attive, coinvolgere nuovi contributori e diffondere la cultura del Software Libero attraverso eventi, formazione e attività sul territorio.</p>
+     <p>Lo stand è aperto a tutti e non è richiesta alcuna registrazione aggiuntiva oltre a quella prevista per la conferenza.</p>
+    </body>
+
+    <link>https://conference.libreoffice.org/</link>
+    <tags>
+            <tag key="it">
+          Italia      </tag>
+            <tag key="talk"/>
+<tag key="infobooth"/>
+      <tag key="front-page"/>
+    </tags>
+  </event>
+</eventset>

fsfe.org/events/2026/event-20261030-01.en.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<eventset>
+  <version>1</version>
+  <event start="2026-10-30T13:00:00Z" end="2026-10-30T19:00:00Z">
+        <title>FSFE booth at the Carinthian Linux Day 2026 in Villach, Österreich</title>
+    <group>
+     <name>Vienna</name> 
+     <url></url>
+    </group>
+
+    <body>
+      <p>The Carinthian Linux Day will be an afternoon and evening of Linux, FLOSS and digital sovereignty. There will be a keynote, talks, workshops, discussions and info booths. In particular also an FSFE info booth!</p>
+     <p>The event will be in German, free of charge, on October 30th 2026, from 15:00 in the &quot;IT-Gymnasium St.Martin&quot;, St.Martiner Straße 7 in Villach, Austria.</p>
+    </body>
+
+    <link>https://www.linuxtog.at/</link>
+    <tags>
+            <tag key="at">
+          Österreich      </tag>
+            <tag key="infobooth"/>
+      <tag key="front-page"/>
+    </tags>
+  </event>
+</eventset>

fsfe.org/events/events.de.xhtml

@@ -65,7 +65,7 @@
     <h2>Veranstaltungs Vorbereitung</h2>
     <p>
       Wenn du Material über die FSFE und ihre Aktivitäten für deine Veranstaltung
-      benötigst, fülle bitte <a href="https://share.fsfe.org/apps/forms/s/Sk2teQXqccbDxcWWW3RKECMq">Formular für die Vorbereitungen</a>
+      benötigst, fülle bitte <a href="/events/tools/boothregistration.html">Formular für die Vorbereitungen</a>
       aus.
     </p>
   </sidebar>

fsfe.org/events/events.en.xhtml

@@ -65,7 +65,7 @@
     <h2>Booth preparation</h2>
     <p>
       If you need material about the FSFE and our activities for
-      your event, please <a href="https://share.fsfe.org/apps/forms/s/Sk2teQXqccbDxcWWW3RKECMq">fill out the booth preparation form</a>
+      your event, please <a href="/events/tools/boothregistration.html">fill out the booth preparation form</a>
       and let us know about it!
     </p>
   </sidebar>

fsfe.org/events/events.it.xhtml

@@ -66,7 +66,7 @@
 
     <p>
       Se hai bisogno di materiale sulla FSFE e sulle nostre attività per il
-      tuo evento, per favore <a href="https://share.fsfe.org/apps/forms/s/Sk2teQXqccbDxcWWW3RKECMq">compila
+      tuo evento, per favore <a href="/events/tools/boothregistration.html">compila
 	il modulo per la preparazione dello stand</a> e faccelo sapere!
     </p>
   </sidebar>

fsfe.org/events/tools/boothregistration.en.xhtml

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<html>
+  <version>1</version>
+
+  <head>
+    <title>Prepare a FSFE booth</title>
+  </head>
+
+  <body class="ltr">
+    <h1>Prepare a FSFE booth</h1>
+
+    <div id="introduction">
+      <p>
+		Please give us some information about the booth that you are 
+		planning, in order for us to be able to pack the material 
+		accordingly. If you have questions or doubts, check first <a 
+		href="https://docs.fsfe.org/en/KnowHow/Groups/OrganizeABooth">how 
+		to organize a booth</a>. If that has not all the answers you're 
+		looking for, please <a 
+		href="/about/contact.html">contact us</a>.
+      </p>
+    </div>
+
+    <form action="/cgi-bin/registerbooth.php" method="POST" class="fsfe-form" enctype="multipart/form-data" role="form">
+      <!-- @TRANSLATORS: there is no need to translate the HTML
+    attributes of the elements in this form, just the text between
+    the '>' and '<'.
+
+    An example:
+
+    <label><input type="checkbox" name="tags[]" value="localgroup" />talk</label>
+
+    can be translated to Spanish
+
+    <label><input type="checkbox" name="tags[]" value="localgroup" />grupo local</label>
+
+    Thank you! -->
+      <input name="register_booth" type="hidden"/>
+
+      <label for="name" class="required">Your name<span class="star">*</span></label>
+      <input name="name" value="" required="required" type="text"/>
+
+      <label for="email" class="required">Your email<span class="star">*</span></label>
+      <input name="email" value="" required="required" type="email"/>
+
+      <p class="help-block">
+        Your personal information will never be shared nor sold. It is used only
+        to get in contact with you if there are any callbacks or problems.
+      </p>
+
+      <div class="form-group">
+        <label for="experience">Did you organise an FSFE booth before?<span class="star">*</span></label>
+        <select id="experience" name="experience" class="form-control" required="required">
+		  <option value="" disabled="disabled" selected="selected" hidden="hidden"></option>
+          <option value="no">No</option>
+          <option value="one-three">Yes (1-3)</option>
+          <option value="more-three">Yes (more than 3)</option>
+        </select>
+      </div>
+      
+      <div class="form-group">
+        <label for="material">What do you want to present at the booth?<span class="star">*</span></label>
+        <select id="material" name="material" class="form-control" required="required">
+		  <option value="" disabled="disabled" selected="selected" hidden="hidden"></option>
+          <option value="poster-sticker">Only posters and stickers</option>
+          <option value="infomaterial">Information material for activities of the FSFE (posters, stickers, leaflets)</option>
+          <option value="infomaterial-merch">Information material and selling merchandise</option>
+          <option value="material-ada">Material about Ada &amp; Zangemann (posters, stickers, postcards, bookmarks)</option>
+        </select>
+        <p class="help-block">
+		  We recommend no merchandise if it is your first booth. 
+		  Depending on the size of the space available, consider only 
+		  to present stickers and posters. You can keep info material 
+		  which is left over, but all the unsold merchandise must be 
+		  returned within a week.
+        </p>
+        <p class="help-block">
+		  Please add any additional information in the "Additional notes" field below.
+        </p>
+        <p class="help-block">
+		  Note that each booth will be evaluated for better preparing upcoming events.
+        </p>
+      </div>
+      
+      <label for="eventdescription" class="required">What kind of event is the booth part of?<span class="star">*</span></label>
+      <textarea id="eventdescription" name="eventdescription" required="required"></textarea>
+      <p class="help-block">
+		  If the event has a webpage, please provide it here. E.g. is 
+		  it part if a city festival, some event on the university 
+		  campus, a FLOSS community meeting.
+       </p>      
+      <p><strong>Where do you want to have the booth?</strong></p>
+      <label for="city">City<span class="star">*</span></label> 
+      <input id="city" name="city" value="" required="required" type="text"/>
+      
+      <div class="form-group">
+        <label for="country">Country<span class="star">*</span></label>
+        <country-list/>
+      </div>
+
+      <label for="startdate" class="required">When does the event start?<span class="star">*</span></label>
+      <input name="startdate" value="" required="required" type="date"/>
+      <p class="help-block">
+		  Please note that you should give us 6 weeks for packaging. 3 weeks is possible in emergencies.
+      </p>
+      
+      <div class="form-group">
+        <label for="people">How many people do you expect to attend the event?<span class="star">*</span></label>
+        <select id="people" name="people" class="form-control" required="required">
+		  <option value="" disabled="disabled" selected="selected" hidden="hidden"></option>
+          <option value="5">5</option>
+          <option value="50">50</option>
+          <option value="500">500</option>
+          <option value="5000">5000</option>
+        </select>
+      </div>
+      
+      <label for="language">What languages would you prefer the information material to be in?<span class="star">*</span></label> 
+      <input id="language" name="language" value="" required="required" type="text"/>
+      <p class="help-block">
+		  You can <a href="/contribute/spreadtheword.html">check the available material</a>. English is the default language of the material.
+      </p>
+      
+      <div class="form-group">
+        <label for="package">How large should the package be?<span class="star">*</span></label>
+        <select id="package" name="package" class="form-control" required="required">
+	      <option value="" disabled="disabled" selected="selected" hidden="hidden"></option>
+          <option value="S">S (2kg of promotion material)</option>
+          <option value="M">M (more promotion material, decoration material, some things to give away)</option>
+          <option value="L">L (merchandise material + the M package)</option>
+        </select>
+        <p class="help-block">
+		  The S package contains around: 16 posters, 30 postcards, 24 leaflets and 300 stickers  that cover all of our campaigns.
+		  <br />
+		  The M package is a bit more then twice the S package.
+		  <br />
+		  The L package is customized for the specific event.
+        </p>
+        <p class="help-block">
+		  If you want some customization of the included promotion material, please provide us more information in the "Additional Notes" field below. Don't forget to provide the preferred language information above.
+        </p>
+      </div>
+      
+      <label for="address">What address should the package be sent to?<span class="star">*</span></label> 
+      <input ide="address" name="address" value="" required="required" type="text"/>
+      
+      <label for="notes">Additional notes</label> 
+      <textarea id="notes" name="notes"></textarea>
+      <p class="help-block">
+		  If you have any additional notes about your booth or what you want to present there, please let us know.
+      </p>
+      
+      <label for="personalinfo"> Can you provide some more background about yourself?</label> 
+      <textarea id="personalinfo" name="personalinfo"></textarea>
+      <p class="help-block">
+		  Tell us a bit about you and your involvement in the Free Software community.
+      </p>
+      
+      <p class="n">
+        Please do not put anything in here:
+        <input type="text" size="40" name="url" aria-required="false"/>
+      </p>
+        
+      <input value="Submit booth" name="submit" type="submit"/>
+      <p class="help-block"><span class="star">(*)</span> indicates required fields.</p>
+    </form>
+
+    <p>Thank you for registering a booth!</p>
+
+  </body>
+<translator/>
+</html>
+

fsfe.org/events/tools/boothregistration.sources

@@ -0,0 +1 @@
+global/countries/countries:[]

fsfe.org/events/tools/boothregistration.xsl

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:import href="../../fsfe.xsl"/>
+  <xsl:import href="../../../global/xslt/internal/countries.xsl"/>
+  <!-- Dropdown list of countries requiring a choice -->
+  <!-- when copying this, remember importing the xsl, and editing the .source file -->
+  <xsl:template match="country-list">
+    <xsl:call-template name="country-list">
+      <xsl:with-param name="required" select="'yes'"/>
+      <xsl:with-param name="class" select="'form-control'"/>
+    </xsl:call-template>
+  </xsl:template>
+</xsl:stylesheet>

fsfe.org/events/tools/eventregistration.de.xhtml

@@ -222,6 +222,9 @@
         <div class="checkbox">
           <label><input type="checkbox" name="tags[]" value="meeting"/>Treffen</label>
         </div>
+        <div class="checkbox">
+          <label><input type="checkbox" name="tags[]" value="ada-zangemann"/>Ada &amp; Zangemann</label>
+        </div>
       </div>
 
       <label for="url">URL zur Veranstaltung (wenn verfügbar)</label>

fsfe.org/events/tools/eventregistration.en.xhtml

@@ -212,6 +212,9 @@
         <div class="checkbox">
           <label><input type="checkbox" name="tags[]" value="meeting"/>meeting</label>
         </div>
+        <div class="checkbox">
+          <label><input type="checkbox" name="tags[]" value="ada-zangemann"/>Ada &amp; Zangemann</label>
+        </div>
       </div>
 
       <label for="url">Event URL (if available)</label>

fsfe.org/events/tools/eventregistration.it.xhtml

@@ -211,6 +211,9 @@
         <div class="checkbox">
           <label><input type="checkbox" name="tags[]" value="meeting"/>meeting</label>
         </div>
+        <div class="checkbox">
+          <label><input type="checkbox" name="tags[]" value="ada-zangemann"/>Ada &amp; Zangemann</label>
+        </div>
       </div>
 
       <label for="url">URL per l'evento (se disponibile)</label>

fsfe.org/events/tools/eventregistration.nl.xhtml

@@ -249,6 +249,9 @@
         <div class="checkbox">
           <label><input type="checkbox" name="tags[]" value="meeting"/>ontmoeting</label>
         </div>
+        <div class="checkbox">
+          <label><input type="checkbox" name="tags[]" value="ada-zangemann"/>Ada &amp; Zangemann</label>
+        </div>
       </div>
       <label for="url">Evenement URL (indien beschikbaar)</label>
       <input name="url" value="" type="text"/>

fsfe.org/internal/pd.en.xhtml

@@ -98,6 +98,9 @@
         <label class="radio-inline">
           <input type="radio" name="dest" value="44/66"/> Sweden
         </label>
+        <label class="radio-inline">
+          <input type="radio" name="dest" value="23/34"/> Poland (not Wrocław or Warsaw)
+        </label>
         <label class="radio-inline">
           <input type="radio" name="dest" value="other" id="destOther"/> Other
         </label>

fsfe.org/internal/subdir.py

@@ -12,6 +12,7 @@ from typing import TYPE_CHECKING
 from urllib.parse import urlparse
 
 import requests
+from fsfe_website_build.globals import FALLBACK_LANG
 from fsfe_website_build.lib.misc import update_if_changed
 from lxml import etree
 
@@ -74,6 +75,6 @@ def run(source: Path, languages: list[str], processes: int, working_dir: Path) -
         option.text = f"{tag} ({description})"
 
     update_if_changed(
-        working_dir.joinpath("fsfe-activities-options.en.xml"),
+        working_dir.joinpath(f"fsfe-activities-options.{FALLBACK_LANG}.xml"),
         etree.tostring(page, encoding="utf-8").decode("utf-8"),
     )

fsfe.org/look/base.less

@@ -699,30 +699,6 @@ div#content {
     }
   }
 
-  /* blocks that stand out */
-
-  .standout {
-    margin-top: 1.5em;
-    margin-bottom: 1.5em;
-    margin-left: -1.5em;
-    padding-top: 0.5em;
-    padding-bottom: 0.5em;
-    @media (min-width: @screen-sm-min) {
-      margin-left: -3em;
-    }
-  }
-  .standout-text {
-    .standout;
-    padding-left: 1.5em;
-    @media (min-width: @screen-sm-min) {
-      padding-left: 3em;
-    }
-  }
-  .standout-text-bggreen {
-    .standout-text;
-    background-color: @brand-green-lighter;
-  }
-
   blockquote,
   .blockQuote,
   .blockHighlight,
@@ -747,6 +723,30 @@ div#content {
   }
 }
 
+/* blocks that stand out */
+
+.standout {
+	margin-top: 1.5em;
+	margin-bottom: 1.5em;
+	margin-left: -1.5em;
+	padding-top: 0.5em;
+	padding-bottom: 0.5em;
+	@media (min-width: @screen-sm-min) {
+	  margin-left: -3em;
+	}
+}
+.standout-text {
+	.standout;
+	padding-left: 1.5em;
+	@media (min-width: @screen-sm-min) {
+	  padding-left: 3em;
+	}
+}
+.standout-text-bggreen {
+	.standout-text;
+	background-color: @brand-green-lighter;
+}
+
 /* subpages "backward compatibility" */
 
 div#subpages {
@@ -1269,6 +1269,7 @@ blockquote#statement p {
   font-weight: unset;
 }
 
+
 /* -------------------------------------------------------------------- */
 /* Interviews                                                           */
 /* -------------------------------------------------------------------- */

fsfe.org/look/elements/card-grid.less

@@ -0,0 +1,45 @@
+/* Card grid used for activity's landing pages but can also be used stand-alone in a div */
+
+.card-grid {
+  .make-row;
+
+  .card {
+    .make-md-column(6);
+    display: flex;
+    flex-direction: column;
+    margin-top: @line-height-computed;
+
+    @media (min-width: @screen-md-min) {
+      &:nth-child(odd) {
+        clear: both;
+      }
+    }
+
+    img {
+      max-width: 100%;
+      height: auto;
+      margin-bottom: (@line-height-computed / 2);
+      border: 3px solid (@link-color);
+    }
+      a {
+      &:hover img {
+        border-color: darken(@link-color, 15%);
+      }
+    }
+
+    h2 {
+      margin-top: 0;
+      margin-bottom: (@line-height-computed / 2);
+      display: flex;
+	  justify-content: center;
+
+      a {
+        vertical-align: middle;
+      }
+    }
+
+    p {
+      margin-top: 0;
+    }
+  }
+}

fsfe.org/look/elements/table-colored.less

@@ -0,0 +1,37 @@
+// ============================================================================
+// Classes for colored tables
+// ============================================================================
+
+table.colored th {
+  color: white;
+  background-color: #3394ce;
+}
+table.colored td {
+  border-bottom: 1px solid #74AA50;
+}
+table.colored th,
+table.colored td {
+  text-align: left;
+  padding-left: 0.3em;
+  padding-right: 0.3em;
+  width: auto;
+}
+table.colored th:first-child,
+table.colored td:first-child {
+  text-align: left;
+  width: auto;
+}
+table.colored tr.sum td {
+  font-weight: bold;
+  background-color: #d7eaf6;
+  border-bottom: 1.5em solid white;
+}
+
+table.colored th.header-cell {
+  font-size: 1.1em;
+  background-color: #74AA50;
+  color: #fff;
+}
+table.colored tr.row-highlight {
+  background-color: rgba(116, 170, 80, 0.2);
+}