diff --git a/_i18n/en.yml b/_i18n/en.yml
index 6143c92e..a1915995 100644
--- a/_i18n/en.yml
+++ b/_i18n/en.yml
@@ -331,3 +331,11 @@ live_os:
   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."
+selfhosted_cloud:
+  software: "Self-Hosted Cloud Server Software"
+  warning: "If you are currently using a Cloud Storage Services like Dropbox, Google Drive, Microsoft OneDrive or Apple iCloud, you should think about hosting it on your own."
+  pydio_descr: "Pydio is open source software that turns instantly any server (on-premise, NAS, cloud IaaS or PaaS) into a file sharing platform for your company. It is an alternative to SaaS Boxes and Drives, with more control, safety and privacy, and favorable TCOs."
+  tahoe_descr: "Tahoe-LAFS is a Free and Open decentralized cloud storage system. It distributes your data across multiple servers. Even if some of the servers fail or are taken over by an attacker, the entire file store continues to function correctly, preserving your privacy and security."
+  nextcloud_descr: "Similar functionally to the widely used Dropbox, with the difference being that Nextcloud is free and open-source, and thereby allowing anyone to install and operate it without charge on a private server, with no limits on storage space or the number of connected clients."
+  worth_mentioning: "Worth Mentioning"
+  cryptpad_descr: "- End-to-end encrypted real time collaboration sharing folders, media, and documents (open-source)."
diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html
index f7f7b433..ca5db582 100644
--- a/_includes/sections/operating-systems.html
+++ b/_includes/sections/operating-systems.html
@@ -1,7 +1,7 @@
 <h1 id="os" class="anchor"><a href="#os"><i class="fas fa-link anchor-icon"></i></a> {% t pc_os.pc_operating_systems %}</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>{% t pc_os.ms_apple_warning %}</strong>
+  <strong>{% t pc_os.ms_warning %}</strong>
 </div>
 
 {%- capture pc_os_qubesos_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%}
diff --git a/_includes/sections/selfhosted-cloud.html b/_includes/sections/selfhosted-cloud.html
index ca02b5d0..2efc8597 100644
--- a/_includes/sections/selfhosted-cloud.html
+++ b/_includes/sections/selfhosted-cloud.html
@@ -1,9 +1,13 @@
-<h1 id="mycloud" class="anchor"><a href="#mycloud"><i class="fas fa-link anchor-icon"></i></a> Self-Hosted Cloud Server Software</h1>
+<h1 id="mycloud" class="anchor"><a href="#mycloud"><i class="fas fa-link anchor-icon"></i></a> {% t selfhosted_cloud.software %}</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>If you are currently using a Cloud Storage Services like Dropbox, Google Drive, Microsoft OneDrive or Apple iCloud, you should think about hosting it on your own.</strong>
+  <strong>{% t selfhosted_cloud.warning %}</strong>
 </div>
 
+{%- capture selfhosted_cloud_pydio_descr -%}{% t selfhosted_cloud.pydio_descr %}{%- endcapture -%}
+{%- capture selfhosted_cloud_tahoe_descr -%}{% t selfhosted_cloud.tahoe_descr %}{%- endcapture -%}
+{%- capture selfhosted_cloud_nextcloud_descr -%}{% t selfhosted_cloud.nextcloud_descr %}{%- endcapture -%}
+
 <div class="row mb-2">
 
   {% include card.html color="success"
@@ -11,8 +15,7 @@
   image="/assets/img/tools/Pydio.png"
   url="https://pydio.com/"
   footer="OS: Windows, macOS, Linux, iOS, Android."
-  description="Pydio is open source software that turns instantly any server (on-premise, NAS, cloud IaaS or PaaS) into a file sharing platform for your company. It is an alternative
-  to SaaS Boxes and Drives, with more control, safety and privacy, and favorable TCOs."
+  description=selfhosted_cloud_pydio_descr
   %}
 
   {% include card.html color="primary"
@@ -20,8 +23,7 @@
   image="/assets/img/tools/Tahoe-LAFS.png"
   url="https://www.tahoe-lafs.org/"
   footer="OS: Windows, macOS, Linux."
-  description="Tahoe-LAFS is a Free and Open decentralized cloud storage system. It distributes your data across multiple servers. Even if some of the servers fail or are
-  taken over by an attacker, the entire file store continues to function correctly, preserving your privacy and security."
+  description=selfhosted_cloud_tahoe_descr
   %}
 
   {% include card.html color="warning"
@@ -29,12 +31,12 @@
   image="/assets/img/provider/Nextcloud.png"
   url="https://nextcloud.com/"
   footer="Client OS: Windows, macOS, Linux, BSD, Unix, iOS, Android, Fire OS. Server: Linux."
-  description="Similar functionally to the widely used Dropbox, with the difference being that Nextcloud is free and open-source, and thereby allowing anyone to install and operate it without charge on a private server, with no limits on storage space or the number of connected clients."
+  description=selfhosted_cloud_nextcloud_descr
   %}
 
 </div>
 
-<h3>Worth Mentioning</h3>
+<h3>{% t selfhosted_cloud.worth_mentioning %}</h3>
 <ul>
-  <li><a href="https://github.com/xwiki-labs/cryptpad/">CryptPad</a> - End-to-end encrypted real time collaboration sharing folders, media, and documents (open-source).</li>
+  <li><a href="https://github.com/xwiki-labs/cryptpad/">CryptPad</a> {% t selfhosted_cloud.cryptpad_descr %}</li>
 </ul>