diff --git a/_i18n/en.yml b/_i18n/en.yml index fa4ddd74..c6a175a3 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -6,6 +6,7 @@ global: language: "Language" download: "Download" related_information: "Related Information" + contrib: "This software may depend on or recommend non-free software." aria: nav_toggle: "Toggle navigation" service_descriptions: @@ -292,13 +293,9 @@ services: helps: "any donation helps!" router: firmware: "Open Source Router Firmware" - contrib: "contrib" - contrib_descr: "This software may depend on or recommend non-free software." openwrt_title: "OpenWrt" - openwrt_labels: "warning:contrib:This software may depend on or recommend non-free software." openwrt_descr: "OpenWrt is an operating system (in particular, an embedded operating system) based on the Linux kernel, primarily used on embedded devices to route network traffic. The main components are the Linux kernel, util-linux, uClibc and BusyBox. All components have been optimized for size, to be small enough for fitting into the limited storage and memory available in home routers." pfsense_title: "pfSense" - pfsense_labels: "warning:contrib:This software may depend on or recommend non-free software." pfsense_descr: "pfSense is an open source firewall/router computer software distribution based on FreeBSD. It is installed on a computer to make a dedicated firewall/router for a network and is noted for its reliability and offering features often only found in expensive commercial firewalls. pfSense is commonly deployed as a perimeter firewall, router, wireless access point, DHCP server, DNS server, and as a VPN endpoint." librecmc_title: "LibreCMC" librecmc_descr: "LibreCMC is a GNU/Linux-libre distribution for computers with minimal resources, such as the Ben Nanonote, ath9k-based Wi-Fi routers, and other hardware with emphasis on free software. The project's current goal is to aim for compliance with the GNU Free System Distribution Guidelines (GNU FSDG) and ensure that the project continues to meet these requirements set forth by the Free Software Foundation (FSF)." @@ -310,10 +307,7 @@ router: pc_os: pc_operating_systems: "PC Operating Systems" ms_apple_warning: "If you are currently using a operating system like Microsoft Windows or Apple macOS, you should pick an alternative here." - contrib: "contrib" - contrib_descr: "This software may depend on or recommend non-free software." qubesos_title: "Qubes OS" - qubesos_labels: "warning:contrib:This software may depend on or recommend non-free software." qubesos_descr: "Qubes is an open-source operating system designed to provide strong security for desktop computing. Qubes is based on Xen, the X Window System, and Linux, and can run most Linux applications and utilize most of the Linux drivers." debian_title: "Debian" debian_descr: "Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project." @@ -323,7 +317,7 @@ pc_os: win10_nightmare: "Don't use Windows 10 - It's a privacy nightmare" worth_mentioning: "Worth Mentioning" openbsd: "OpenBSD" - openbsd_descr: "- A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography." + openbsd_descr: "- A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography." arch: "Arch Linux" arch_descr: "- A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement." parabola: "Parabola" @@ -333,16 +327,11 @@ pc_os: mobile_os: mobile_operating_systems: "Mobile Operating Systems" google_warning: "Even though the source code of the following OS is provided, installing Google Apps may compromise your setup." - contrib: "contrib" - contrib_descr: "This software may depend on or recommend non-free software." lineageos_title: "LineageOS" - lineageos_labels: "warning:contrib:This software may depend on or recommend non-free software." lineageos_descr: "LineageOS is a free and open-source operating system for smartphones and tablets, based on the official releases of the Android Open Source Project. It is the continuation of the CyanogenMod project." ubuntu_touch_title: "Ubuntu Touch" - ubuntu_touch_labels: "warning:contrib:This software may depend on or recommend non-free software." ubuntu_touch_descr: "Ubuntu Touch is a free and open-source operating system for smartphones and tablets. It's an alternative to the current popular mobile operating systems on the market. Only a few devices are supported." grapheneos_title: "GrapheneOS" - grapheneos_labels: "warning:contrib:This software may depend on or recommend non-free software." grapheneos_descr: "GrapheneOS is a free and open-source security and privacy focused mobile operating system built on top of the Android Open Source Project. It currently specifically targets devices offering strong hardware security." worth_mentioning: "Worth Mentioning" replicant: "Replicant" @@ -352,18 +341,13 @@ mobile_os: microg: "MicroG" microg_descr: "- A project that aims to reimplement the proprietary Google Play Services in the Android operating system with a FLOSS replacement." live_os: - live_cd: "Live CD Operating Systems" - contrib: "contrib" - contrib_descr: "This software may depend on or recommend non-free software." - tails_title: "Tails" - tails_labels: "warning:contrib:This software may depend on or recommend non-free software." - tails_descr: "Tails is a live operating system, that starts on almost any computer from a DVD, USB stick, or SD card. It aims at preserving privacy and anonymity, and helps to: Use the Internet anonymously and circumvent censorship; Internet connections go through the Tor network; leave no trace on the computer; use state-of-the-art cryptographic tools to encrypt files, emails and instant messaging." - knoppix_title: "KNOPPIX" - knoppix_labels: "warning:contrib:This software may depend on or recommend non-free software." - knoppix_descr: "Knoppix is an operating system based on Debian designed to be run directly from a CD / DVD (Live CD) or a USB flash drive (Live USB), one of the first of its kind for any operating system. When starting a program, it is loaded from the removable medium and decompressed into a RAM drive. The decompression is transparent and on-the-fly." - puppy_linux_title: "Puppy Linux" - puppy_linux_labels: "warning:contrib:This software may depend on or recommend non-free software." - puppy_linux_descr: "Puppy Linux operating system is a lightweight Linux distribution that focuses on ease of use and minimal memory footprint. The entire system can be run from RAM with current versions generally taking up about 210 MB, allowing the boot medium to be removed after the operating system has started." - worth_mentioning: "Worth Mentioning" - tiny_core_linux: "Tiny Core Linux" - tiny_core_linux_descr: "- A minimal Linux operating system focusing on providing a base system using BusyBox and FLTK. The distribution is notable for its size (15 MB) and minimalism, with additional functionality provided by extensions." \ No newline at end of file + live_cd: "Live CD Operating Systems" + tails_title: "Tails" + tails_descr: "Tails is a live operating system, that starts on almost any computer from a DVD, USB stick, or SD card. It aims at preserving privacy and anonymity, and helps to: Use the Internet anonymously and circumvent censorship; Internet connections go through the Tor network; leave no trace on the computer; use state-of-the-art cryptographic tools to encrypt files, emails and instant messaging." + knoppix_title: "KNOPPIX" + knoppix_descr: "Knoppix is an operating system based on Debian designed to be run directly from a CD / DVD (Live CD) or a USB flash drive (Live USB), one of the first of its kind for any operating system. When starting a program, it is loaded from the removable medium and decompressed into a RAM drive. The decompression is transparent and on-the-fly." + puppy_linux_title: "Puppy Linux" + puppy_linux_descr: "Puppy Linux operating system is a lightweight Linux distribution that focuses on ease of use and minimal memory footprint. The entire system can be run from RAM with current versions generally taking up about 210 MB, allowing the boot medium to be removed after the operating system has started." + worth_mentioning: "Worth Mentioning" + tiny_core_linux: "Tiny Core Linux" + tiny_core_linux_descr: "- A minimal Linux operating system focusing on providing a base system using BusyBox and FLTK. The distribution is notable for its size (15 MB) and minimalism, with additional functionality provided by extensions." diff --git a/_includes/sections/live-operating-systems.html b/_includes/sections/live-operating-systems.html index bc39012b..a6b42e55 100644 --- a/_includes/sections/live-operating-systems.html +++ b/_includes/sections/live-operating-systems.html @@ -1,13 +1,13 @@

{% t live_os.live_cd %}

{%- capture live_os_tails_title -%}{% t live_os.tails_title %}{%- endcapture -%} -{%- capture live_os_tails_labels -%}{% t live_os.tails_labels %}{%- endcapture -%} +{%- capture live_os_tails_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%} {%- capture live_os_tails_descr -%}{% t live_os.tails_descr %}{%- endcapture -%} {%- capture live_os_knoppix_title -%}{% t live_os.knoppix_title %}{%- endcapture -%} -{%- capture live_os_knoppix_labels -%}{% t live_os.knoppix_labels %}{%- endcapture -%} +{%- capture live_os_knoppix_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%} {%- capture live_os_knoppix_descr -%}{% t live_os.knoppix_descr %}{%- endcapture -%} {%- capture live_os_puppy_linux_title -%}{% t live_os.puppy_linux_title %}{%- endcapture -%} -{%- capture live_os_puppy_linux_labels -%}{% t live_os.puppy_linux_labels %}{%- endcapture -%} +{%- capture live_os_puppy_linux_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%} {%- capture live_os_puppy_linux_descr -%}{% t live_os.puppy_linux_descr %}{%- endcapture -%}
@@ -42,5 +42,5 @@

{% t live_os.worth_mentioning %}

diff --git a/_includes/sections/mobile-operating-systems.html b/_includes/sections/mobile-operating-systems.html index 74164656..571fffc8 100644 --- a/_includes/sections/mobile-operating-systems.html +++ b/_includes/sections/mobile-operating-systems.html @@ -5,13 +5,13 @@
{%- capture mobile_os_lineageos_title -%}{% t mobile_os.lineageos_title %}{%- endcapture -%} -{%- capture mobile_os_lineageos_labels -%}{% t mobile_os.lineageos_labels %}{%- endcapture -%} +{%- capture mobile_os_lineageos_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%} {%- capture mobile_os_lineageos_descr -%}{% t mobile_os.lineageos_descr %}{%- endcapture -%} {%- capture mobile_os_ubuntu_touch_title -%}{% t mobile_os.ubuntu_touch_title %}{%- endcapture -%} -{%- capture mobile_os_ubuntu_touch_labels -%}{% t mobile_os.ubuntu_touch_labels %}{%- endcapture -%} +{%- capture mobile_os_ubuntu_touch_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%} {%- capture mobile_os_ubuntu_touch_descr -%}{% t mobile_os.ubuntu_touch_descr %}{%- endcapture -%} {%- capture mobile_os_grapheneos_title -%}{% t mobile_os.grapheneos_title %}{%- endcapture -%} -{%- capture mobile_os_grapheneos_labels -%}{% t mobile_os.grapheneos_labels %}{%- endcapture -%} +{%- capture mobile_os_grapheneos_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%} {%- capture mobile_os_grapheneos_descr -%}{% t mobile_os.grapheneos_descr %}{%- endcapture -%}
@@ -46,6 +46,6 @@ diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html index 6bb533fc..6ca67370 100644 --- a/_includes/sections/operating-systems.html +++ b/_includes/sections/operating-systems.html @@ -5,7 +5,7 @@
{%- capture pc_os_qubesos_title -%}{% t pc_os.qubesos_title %}{%- endcapture -%} -{%- capture pc_os_qubesos_labels -%}{% t pc_os.qubesos_labels %}{%- endcapture -%} +{%- capture pc_os_qubesos_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%} {%- capture pc_os_qubesos_descr -%}{% t pc_os.qubesos_descr %}{%- endcapture -%} {%- capture pc_os_debian_title -%}{% t pc_os.debian_title %}{%- endcapture -%} {%- capture pc_os_debian_descr -%}{% t pc_os.debian_descr %}{%- endcapture -%} @@ -51,5 +51,5 @@ diff --git a/_includes/sections/router-firmware.html b/_includes/sections/router-firmware.html index 17f7cbe4..7e51baec 100644 --- a/_includes/sections/router-firmware.html +++ b/_includes/sections/router-firmware.html @@ -1,10 +1,10 @@

{% t router.firmware %}

{%- capture router_openwrt_title -%}{% t router.openwrt_title %}{%- endcapture -%} -{%- capture router_openwrt_labels -%}{% t router.openwrt_labels %}{%- endcapture -%} +{%- capture router_openwrt_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%} {%- capture router_openwrt_descr -%}{% t router.openwrt_descr %}{%- endcapture -%} {%- capture router_pfsense_title -%}{% t router.pfsense_title %}{%- endcapture -%} -{%- capture router_pfsense_labels -%}{% t router.pfsense_labels %}{%- endcapture -%} +{%- capture router_pfsense_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%} {%- capture router_pfsense_descr -%}{% t router.pfsense_descr %}{%- endcapture -%} {%- capture router_librecmc_title -%}{% t router.librecmc_title %}{%- endcapture -%} {%- capture router_librecmc_descr -%}{% t router.librecmc_descr %}{%- endcapture -%} @@ -41,5 +41,5 @@