timeline/proofread/EN (#6071)

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

.drone.yml

@@ -8,7 +8,7 @@ clone:
 
 steps:
   - name: pre-commit
-    image: docker:28
+    image: docker:29
     environment:
       # Environment variables necessary for rootless Docker
       XDG_RUNTIME_DIR: "/run/user/1001"
@@ -28,7 +28,7 @@ steps:
 
   # Test building the deploy docker image
   - name: test-build-docker-image
-    image: docker:28
+    image: docker:29
     environment:
       # Environment variables necessary for rootless Docker
       XDG_RUNTIME_DIR: "/run/user/1001"
@@ -59,7 +59,7 @@ steps:
         - deployment
 
   - name: deploy-master
-    image: docker:28
+    image: docker:29
     environment:
       # Environment variables necessary for rootless Docker
       XDG_RUNTIME_DIR: "/run/user/1001"
@@ -93,7 +93,7 @@ steps:
           - pull_request
 
   - name: deploy-test
-    image: docker:28
+    image: docker:29
     environment:
       # Environment variables necessary for rootless Docker
       XDG_RUNTIME_DIR: "/run/user/1001"
@@ -145,4 +145,6 @@ volumes:
       path: /run/user/1001/docker.sock
 ---
 kind: signature
-hmac: 5f8becf08f74b7561bc7c06c023e234689d0b281806cbf37b96b12387266479d
+hmac: 401498225cd0b7d0b3b112f077e2cab1c5f58872f1eec9da14500021c2994628
+
+...

.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-20260316
+FROM debian:13
 
 COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
 

build/fsfe_website_build/build.py

@@ -159,11 +159,7 @@ def _run_build(global_build_config: GlobalBuildConfig) -> None:
             full(global_build_config.source)
         global_symlinks(
             global_build_config.source,
-            (
-                global_build_config.languages
-                if global_build_config.languages
-                else global_build_config.all_languages
-            ),
+            (global_build_config.languages or global_build_config.all_languages),
             pool,
         )
         # Create our stable config across all sites
@@ -182,12 +178,8 @@ def _run_build(global_build_config: GlobalBuildConfig) -> None:
                 global_build_config,
                 site,
             )
-            languages: list[str] = (
-                global_build_config.languages
-                if global_build_config.languages
-                else sorted(
-                    {lang_from_filename(path) for path in site.glob("**/*.*.xhtml")},
-                )
+            languages: list[str] = global_build_config.languages or sorted(
+                {lang_from_filename(path) for path in site.glob("**/*.*.xhtml")},
             )
             # Now we know our languages, build our site build config
             site_build_config = SiteBuildConfig(languages, site)

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/prepare_subdirectories.py

@@ -28,9 +28,11 @@ def prepare_subdirectories(
     logger.info("Preparing Subdirectories")
     for subdir_path in sorted(
         (path.parent for path in source_site.glob("**/subdir.py")),
-        key=lambda directory: directory.joinpath("subdir-prio.txt").read_text().strip()
-        if directory.joinpath("subdir-prio.txt").exists()
-        else "0",
+        key=lambda directory: (
+            directory.joinpath("subdir-prio.txt").read_text().strip()
+            if directory.joinpath("subdir-prio.txt").exists()
+            else "0"
+        ),
     ):
         logger.info("Preparing subdirectory %s", subdir_path)
         sys.path.append(str(subdir_path.resolve()))

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]
 
@@ -152,7 +155,7 @@ RewriteRule ^drm.info(/.*)? https://drm.info$1 [R=301,L]
 # Youth Hacking 4 Freedom
 # Redirect for registration
 # TODO please update the link for new registration form
-RewriteRule ^activities/yh4f/register https://share.fsfe.org/apps/forms/s/iqeXngDaatNeDd2z9jyCa8se [R=307,L]
+RewriteRule ^activities/yh4f/register https://share.fsfe.org/apps/forms/s/3Ze8ML4PHjpF4o3727Pkgsog [R=307,L]
 RewriteRule ^activities/yh4f/feedback https://share.fsfe.org/apps/forms/s/TD87s7Ze8566BJ4pQ76TxS7s [R=307,L]
 RewriteRule ^activities/yh4f/mediakit https://download.fsfe.org/YH4F/Youth_Hacking_4_Freedom_2025.pdf [R=301,L]
 RewriteRule ^activities/yh4f/awards-ceremony https://share.fsfe.org/apps/forms/s/7KJ26dzyeeBZznZTBLqjLqrE [R=307,L]
@@ -177,6 +180,8 @@ RewriteRule ^about/reports/es-2007(.*)$ /news/2007/news-20070630-01$1 [R=301,L]
 RewriteRule ^about/reports/es-2009(.*)$ /news/2009/news-20090620-01$1 [R=301,L]
 RewriteRule ^freesoftware/enterprise/freesoftwarecompany(.*)$ /news/2008/news-20081202-02$1 [R=301,L]
 RewriteRule ^freesoftware/enterprise/chargeofitsbrand(.*)$ /news/2009/news-20090604-01$1 [R=301,L]
+RewriteRule ^events/SFD-2010(.*)$ news/2010/news-20100918-01$1 [R=301,L]
+RewriteRule ^events/fscons-2010(.*)$ news/2010/news-20101105-01$1 [R=301,L]
 
 # Old/moved people/staff profiles
 RewriteRule ^about/(bako|polvani|tuke|maffulli|jakobs|oriordan|oberg|coughlan|weiden|nanda)(/.*)?$ /about/people/index.html [R=301,L]
@@ -265,13 +270,14 @@ RewriteRule ^contact/community(.*) /about/contact$1 [R=301,L]
 RewriteRule ^about/localteams(.*) /about/contact$1 [R=301,L]
 RewriteRule ^fr/(news|events)\.(..\.)?html /fr/fr.$2html [R=301,L]
 RewriteRule ^activities/wsis/cs-benchmarks\.(.*)$ /activities/wsis/cs-benchmarks-03-11-14.$1 [R=301,L]
-RewriteRule ^contribute/booth(.*) https://wiki.fsfe.org/KnowHow/Groups/OrganizeABooth [R=301,L]
+RewriteRule ^contribute/booth(.*) https://docs.fsfe.org/en/KnowHow/Groups/OrganizeABooth [R=301,L]
 RewriteRule ^work(\...)?(\.html)?$ /about/ourwork$1.html [R=301,L]
 RewriteRule ^community/tools(/.*)?$ /events/tools$1 [R=301,L]
 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.de.xhtml

@@ -163,4 +163,6 @@
 
   <description>Alles über die FSFE - Unsere Arbeit, die Menschen die wir sind, unser Kontakt und Presseinformationen, rechtliche Struktur, und Spenden.</description>
 
+<translator/>
 </html>
+

fsfe.org/about/about.el.xhtml

@@ -201,4 +201,6 @@
 
   <description>Τα πάντα για το FSFE - Το έργο μας, οι άνθρωποι που είμαστε, οι πληροφορίες επικοινωνίας και τύπου, οι συνεργάτες, η νομική δομή και οι δωρεές.</description>
 
+<translator/>
 </html>
+

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>
 
@@ -169,4 +170,6 @@
 
   <description>Everything about the FSFE - Our work, the people we are, our contact and press information, associates, legal structure, and donations.</description>
 
+<translator/>
 </html>
+

fsfe.org/about/about.es.xhtml

@@ -150,4 +150,6 @@
 
   <description>Todo sobre la FSFE - Nuestro trabajo, las personas que somos, nuestra información de contacto y de prensa, los asociados, la estructura legal y las donaciones.</description>
 
+<translator/>
 </html>
+

fsfe.org/about/about.it.xhtml

@@ -140,4 +140,6 @@
 
   <description>Tutto sulla FSFE - Il nostro lavoro, le persone, i contatti e informazioni stampa, consociate, struttura legale e donazioni.</description>
 
+<translator/>
 </html>
+

fsfe.org/about/about.uk.xhtml

@@ -182,4 +182,6 @@
 
   <description>Все про FSFE - наша робота, люди, якими ми є, наша контактна та прес-інформація, партнери, юридична структура та пожертви.</description>
 
+<translator/>
 </html>
+

fsfe.org/about/codeofconduct.de.xhtml

@@ -103,4 +103,6 @@
 
   <sidebar promo="about-fsfe"/>
 
+<translator/>
 </html>
+

fsfe.org/about/codeofconduct.en.xhtml

@@ -82,7 +82,7 @@
       below, and you are welcome to contact them individually too. We recommend
       to communicate via encrypted email. The easiest way to do so is if you
       write one of the team-members indivually. You find their mails and PGP-key
-      in this aphabetically ordered list:
+      in this alphabetically ordered list:
     </p>
 
     <!-- Imports list from codeofconduct-careteam.en.xml -->
@@ -95,4 +95,6 @@
 
   <sidebar promo="about-fsfe"/>
 
+<translator/>
 </html>
+

fsfe.org/about/codeofconduct.sq.xhtml

@@ -97,4 +97,6 @@
 
   <sidebar promo="about-fsfe"/>
 
+<translator/>
 </html>
+

fsfe.org/about/codeofconduct.uk.xhtml

@@ -94,4 +94,6 @@
 
   <sidebar promo="about-fsfe"/>
 
+<translator/>
 </html>
+

fsfe.org/about/contact.de.xhtml

@@ -87,7 +87,7 @@
 				10245 Berlin<br/>
 				Germany</p>
 
-		  	<p>Telefon: +49-30-27595290</p>
+		  	<p>Telefon: Falls Sie uns telefonisch erreichen möchten, vereinbaren Sie bitte einen Termin für einen Rückruf via: contact@fsfe.org</p>
 
 				<p><a href="https://www.openstreetmap.org/node/2825035456#map=16/52.50623/13.45958">Auf OpenStreetMap anzeigen.</a></p>
 

fsfe.org/about/contact.en.xhtml

@@ -54,7 +54,7 @@
     </div>
 
 	<!--	<div style="clear:both;"/> -->
-	<div />
+	<div/>
 
 		<h2>Postal Address</h2>
 
@@ -75,7 +75,7 @@
 				10245 Berlin<br/>
 				Germany</p>
 
-		  	<p>Phone: +49-30-27595290</p>
+		  	<p>Phone: If you would like to contact us by phone, please schedule a callback at: contact@fsfe.org </p>
 
 				<p><a href="https://www.openstreetmap.org/node/2825035456#map=16/52.50623/13.45958">See on OpenStreetMap</a></p>
 
@@ -84,7 +84,7 @@
 		</div>
 
    <!-- <div style="clear:both;"/> -->
-   <div />
+   <div/>
 
     <div class="grid-50-50 sharebuttons">
    
@@ -99,7 +99,7 @@
     </div>
    
    <!-- <div style="clear:both;"/> -->
-   <div />
+   <div/>
 
     <div id="community">
 			
@@ -195,7 +195,9 @@
   </body>
 
   <followup>subscribe-nl</followup>
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/contact.nl.xhtml

@@ -60,7 +60,7 @@
 					10245 Berlin<br/>
 					Germany</p>
 	
-			  	<p>Telefoon: +49-30-27595290</p>
+			  	<p>Telefoon: Als u ons telefonisch wilt bereiken, kunt u via contact@fsfe.org een afspraak maken voor een terugbelverzoek.</p>
 	
 					<p><a href="https://www.openstreetmap.org/node/2825035456#map=16/52.50623/13.45958">Bekijk op OpenStreetMap</a></p>
 	

fsfe.org/about/fsfnetwork.da.xhtml

@@ -54,7 +54,9 @@
     </ul>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/fsfnetwork.el.xhtml

@@ -55,7 +55,9 @@
     </ul>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/fsfnetwork.en.xhtml

@@ -52,4 +52,6 @@
     </ul>
   </body>
 
+<translator/>
 </html>
+

fsfe.org/about/fsfnetwork.es.xhtml

@@ -46,4 +46,6 @@ Trabajamos con otros grupos internacionales para promover el Software Libre en t
     </ul>
   </body>
 
+<translator/>
 </html>
+

fsfe.org/about/fsfnetwork.hr.xhtml

@@ -52,7 +52,9 @@
     </ul>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/fsfnetwork.nl.xhtml

@@ -37,4 +37,6 @@ opgericht. </li>
 
 </body>
 
+<translator/>
 </html>
+

fsfe.org/about/fsfnetwork.ru.xhtml

@@ -52,7 +52,9 @@
       </li>
     </ul>
   </body>
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/fsfnetwork.sq.xhtml

@@ -51,7 +51,9 @@
     </ul>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/fsfnetwork.uk.xhtml

@@ -52,4 +52,6 @@
     </ul>
   </body>
 
+<translator/>
 </html>
+

fsfe.org/about/funds/2001.en.xhtml

@@ -52,7 +52,9 @@
 
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2001.ru.xhtml

@@ -59,7 +59,9 @@
 
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2002.en.xhtml

@@ -50,7 +50,9 @@
 
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2002.ru.xhtml

@@ -55,7 +55,9 @@
 
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2003.el.xhtml

@@ -61,7 +61,9 @@
 
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2003.en.xhtml

@@ -56,7 +56,9 @@
 
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2003.nl.xhtml

@@ -56,7 +56,9 @@
 
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2003.ru.xhtml

@@ -63,7 +63,9 @@
 
 </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2004.el.xhtml

@@ -56,7 +56,9 @@
 
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2004.en.xhtml

@@ -52,7 +52,9 @@
 
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2004.nl.xhtml

@@ -51,7 +51,9 @@
 
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2004.ru.xhtml

@@ -59,7 +59,9 @@
 
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2005.el.xhtml

@@ -56,7 +56,9 @@
 
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2005.en.xhtml

@@ -52,7 +52,9 @@
 
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2005.nl.xhtml

@@ -52,7 +52,9 @@
 
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2005.ru.xhtml

@@ -59,7 +59,9 @@
 
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2006.el.xhtml

@@ -184,7 +184,9 @@
     </p>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2006.en.xhtml

@@ -183,7 +183,9 @@
     </p>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2006.nl.xhtml

@@ -182,7 +182,9 @@
     </p>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2006.ru.xhtml

@@ -170,7 +170,9 @@
 
 </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2007.el.xhtml

@@ -176,7 +176,9 @@
     </p>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2007.en.xhtml

@@ -175,7 +175,9 @@
     </p>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2007.nl.xhtml

@@ -176,7 +176,9 @@
     </p>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2007.ru.xhtml

@@ -163,7 +163,9 @@
 
 </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2008.de.xhtml

@@ -140,7 +140,9 @@
     </ol>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2008.el.xhtml

@@ -143,7 +143,9 @@
     </ol>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2008.en.xhtml

@@ -138,7 +138,9 @@
     </ol>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2008.nl.xhtml

@@ -139,7 +139,9 @@
     </ol>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2008.ru.xhtml

@@ -133,7 +133,9 @@
 </ol>
 </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2009.el.xhtml

@@ -129,7 +129,9 @@
     </ol>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2009.en.xhtml

@@ -129,7 +129,9 @@
     </ol>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2009.ru.xhtml

@@ -121,7 +121,9 @@
 </ol>
 </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2010.en.xhtml

@@ -124,7 +124,9 @@
     </ol>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2011.en.xhtml

@@ -124,7 +124,9 @@
     </ol>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2012.en.xhtml

@@ -124,7 +124,9 @@
     </ol>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2013.en.xhtml

@@ -116,7 +116,9 @@
     </ol>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2014.en.xhtml

@@ -116,7 +116,9 @@
     </ol>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2015.en.xhtml

@@ -111,7 +111,9 @@
     </ol>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2016.en.xhtml

@@ -116,7 +116,9 @@
     </ol>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2017.en.xhtml

@@ -121,7 +121,9 @@
       </li>
     </ol>
   </body>
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2018.en.xhtml

@@ -121,7 +121,9 @@
       </li>
     </ol>
   </body>
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/2019.en.xhtml

@@ -127,4 +127,6 @@
       </li>
     </ol>
   </body>
+<translator/>
 </html>
+

fsfe.org/about/funds/2020.en.xhtml

@@ -132,4 +132,6 @@
       </li>
     </ol>
   </body>
+<translator/>
 </html>
+

fsfe.org/about/funds/2021.en.xhtml

@@ -122,4 +122,6 @@
       </li>
     </ol>
   </body>
+<translator/>
 </html>
+

fsfe.org/about/funds/2022.en.xhtml

@@ -137,4 +137,6 @@
       </li>
     </ol>
   </body>
+<translator/>
 </html>
+

fsfe.org/about/funds/2023.en.xhtml

@@ -142,4 +142,6 @@
       </li>
     </ol>
   </body>
+<translator/>
 </html>
+

fsfe.org/about/funds/2024.en.xhtml

@@ -137,4 +137,6 @@
       </li>
     </ol>
   </body>
+<translator/>
 </html>
+

fsfe.org/about/funds/funds.de.xhtml

@@ -155,7 +155,9 @@
     </ul>
   </sidebar>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/funds.el.xhtml

@@ -155,7 +155,9 @@
     </ul>
   </sidebar>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/funds.en.xhtml

@@ -155,7 +155,9 @@
     </ul>
   </sidebar>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/funds.es.xhtml

@@ -154,7 +154,9 @@
     </ul>
   </sidebar>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/funds.it.xhtml

@@ -155,7 +155,9 @@
     </ul>
   </sidebar>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/funds/funds.ru.xhtml

@@ -157,7 +157,9 @@
     </ul>
   </sidebar>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/graphics/graphics.da.xhtml

@@ -43,7 +43,9 @@
     </p>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/graphics/graphics.de.xhtml

@@ -45,7 +45,9 @@
     </p>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/graphics/graphics.el.xhtml

@@ -44,7 +44,9 @@
     </p>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/graphics/graphics.en.xhtml

@@ -64,7 +64,9 @@
         <li><a href="/about/license-policy.html">Website Content Licensing Policy</a></li>
     </ul>
   </sidebar>
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/graphics/graphics.es.xhtml

@@ -47,7 +47,9 @@ Además, en eventos no organizados por la FSFE directamente o por un grupo local
 
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/graphics/graphics.hr.xhtml

@@ -43,7 +43,9 @@
     </p>
   </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/graphics/graphics.ru.xhtml

@@ -33,7 +33,9 @@
 
 </body>
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***

fsfe.org/about/graphics/sponsoring/sponsoring.da.xhtml

@@ -41,7 +41,9 @@ interaktive medier, bør det være med et link til
   </sidebar>
 
 
-</html><!--
+<translator/>
+</html>
+<!--
 Local Variables: ***
 mode: xml ***
 End: ***