about: update privacy policy

Also clear translated files for this particular template.

14 files changed, 196 insertions, 619 deletions

diff --git a/dist/templates/about/privacy.html.hbs b/dist/templates/about/privacy.html.hbs
index ae525ea..56158cf 100644
--- a/dist/templates/about/privacy.html.hbs
+++ b/dist/templates/about/privacy.html.hbs
@@ -2,67 +2,103 @@
 <div class="about">
     <center><h2><a href="/about">About</a> | <a href="/about/news">News</a> | <a href="/about/usage">Usage</a> | <a href="/about/faq">FAQ</a> | <a href="/about/stats">Stats</a> | Privacy</h2></center>
 
-    <p style="text-align: left;">
-        The public keyserver running on keys.openpgp.org processes, stores and
-        distributes OpenPGP key data. The specific way in which data is processed
-        differs by type as follows:
-        <ul>
-          <li><b>Email Addresses</b>
-              <p>Email addresses contained in <abbr title="Packet Tag 13">User
-                      IDs</abbr> are personally identifiable information (PII).
-                  Special care is taken to make sure they are used only with
-                  consent:
-                  <ul>
-                      <li>
-                          Publishing requires <a target="_blank"
-                              href="https://en.wikipedia.org/wiki/Opt-in_email#Confirmed_opt-in_(COI)_/_Double_opt-in_(DOI)">double
-                              opt-in</a> validation, to prove ownership of the
-                          email address in question.
-                      </li>
-                      <li>Addresses are searchable by exact email address,
-                          but not by associated name.</li>
-                      <li>Enumeration of addresses is not possible.</li>
-                      <li>Deletion of addresses is possible via simple proof
-                          of ownership in an automated fashion, similar to
-                          publication. To unlist an address where this isn't
-                          possible, write to support at keys dot openpgp dot
-                          org.
-                      </li>
-                  </ul>
-              </p>
-              <p>This data is never handed collectively ("as a dump") to third
-                  parties.
-              </p>
-          </li>
-          <li><b>Public Key Data</b>
-              <p>The cryptographic content of OpenPGP keys is not considered personally
-                  identifiable information. This includes specifically
-                  <abbr title="Packet Tags 6 and 14">public key material</abbr>,
-                  <abbr title="Packet Tag 2, Signature types 0x10-0x13, 0x18, 0x19, 0x1F">self-signatures</abbr>, and
-                  <abbr title="Packet Tag 2, Signature types 0x20, 0x28, 0x30">revocation signatures</abbr>.
-              </p>
-              <p>This data is not usually collectively available ("as
-                  a dump"), but may be handed upon request to third
-                  parties for purposes of development or research.
-              </p>
-          </li>
-          <li><b>Other User ID data</b>
-              <p>An OpenPGP key may contain personal data other than email
-                  addresses, such as <abbr title="Packet Tag 13">User IDs</abbr>
-                  that do not contain email addresses, or <abbr
-                  title="Packet Tag 17">image attributes</abbr>. This data is stripped
-              during upload and never stored, processed, or distributed in
-              any way.
-              </p>
-              <p>OpenPGP packet types that were not specifically mentioned above are
-                  stripped during upload and never stored, processed or
-                  distributed in any way.
-              </p>
-          </li>
-      </ul>
-      <p style="text-align: left">Data is never relayed to third parties outside of
-          what is available from the <a href="/about/api">public API interfaces</a>,
-          and what is described in this policy.
-      </p>
+    <h3>Name and contact details</h3>
+    <p>
+        <span class="brand">keys.openpgp.org</span> is a community effort.
+        You can find more information about us, and our contact, details <a href="https://keys.openpgp.org/about">here</a>.
+    </p>
+
+    <h3>How we process data</h3>
+    <p>
+        The public keyserver running on <span class="brand">keys.openpgp.org</span> processes, stores, and distributes OpenPGP certificate data.
+        The specific way in which data is processed differs by type as follows:
+    </p>
+
+    <ul>
+        <li>
+            <h4>Email Addresses</h4>
+
+            <p>
+                Email addresses of individuals contained in <abbr title="Packet Tag 13">User IDs</abbr> are personal data.
+                Special care is taken to make sure they are used only with consent, which you can withdraw at any time:
+            </p>
+
+            <ul>
+                <li>Publishing requires double opt-in validation, to prove ownership of the email address in question.</li>
+                <li>Addresses are searchable by exact email address, but not by associated name.</li>
+                <li>Enumeration of addresses is not possible.</li>
+                <li>Deletion of addresses is possible via simple proof of ownership in an automated fashion, similar to publication, using the <a href="https://keys.openpgp.org/manage">“manage“ tool</a>. To unlist an address where this isn't possible, write to support at keys dot openpgp dot org.</li>
+            </ul>
+
+            <p>
+                This data is never handed collectively (“as a dump“) to third parties.
+            </p>
+        </li>
+
+        <li>
+            <h4>Public Key Data</h4>
+
+            <p>
+                We process the cryptographic content of OpenPGP certificates - such as public key material, self-signatures, and revocation signatures – for the legitimate interest of providing the service.
+            </p>
+            <p>
+                This data is not usually collectively available (“as a dump“), but may be handed upon request to third parties for purposes of development or research.
+            </p>
+            <p>
+                If you upload your OpenPGP certificates to the service, you are the source of this data.
+                It is also possible for anyone who has your public OpenPGP certificate to upload them to this service – for example, if you have published them somewhere else, or sent them to someone. This does not include publication of Email Addresses, which are only used with explicit consent as described above.
+            </p>
+        </li>
+
+        <li>
+            <h4>Other User ID data</h4>
+
+            <p>
+                An OpenPGP certificate may contain personal data other than email addresses, such as User IDs that do not contain email addresses, or image attributes.
+                This data is stripped during upload and never stored, processed, or distributed in any way.
+            </p>
+            <p>
+                OpenPGP packet types that were not specifically mentioned above are stripped during upload and never stored, processed or distributed in any way.
+            </p>
+        </li>
+
+    </ul>
+
+    <p>
+        Data is never relayed to third parties outside of what is available from the public API interfaces, and what is described in this policy and on our <a href="https://keys.openpgp.org/about">about page</a>.
+    </p>
+    <p>
+        This service is available on the Internet, so anyone, anywhere in the world, can access it and retrieve data from it.
+    </p>
+
+    <h3>Retention periods</h3>
+
+    <p>
+        We will retain your email address linked with your OpenPGP certificates until you remove it.
+        We will remove your Public Key Data if you wish, but note that anyone can re-upload it to the service, in keeping with the “public” nature of this key material.
+    </p>
+
+    <p>
+        All incoming requests are logged for a period of 30 days, and only used as necessary for operation of the service.
+        IP addresses are anonymized for storage.
+    </p>
+
+    <h3>Your rights</h3>
+
+    <p>
+        You can withdraw consent to the processing of your email address at any time, or erase your email addresses, using the <a href="https://keys.openpgp.org/manage">“manage“ tool</a>.
+    </p>
+    <p>
+        You can obtain access to the personal data we process about you by viewing your OpenPGP certificates, or searching for your certificates using your email addresses, using this service.
+    </p>
+    <p>
+        You can delete your OpenPGP certificates by emailing support at keys dot openpgp dot org, but note that anyone can upload them again. If you object to having your certificate re-uploaded, email support at keys dot openpgp dot org and we will banlist your keys.
+    </p>
+    <p>
+        To exercise the right of portability, you can download your OpenPGP certificate using this service.
+    </p>
+    <p>
+        If you are in the EEA or UK, you also have the right to lodge a complaint with a supervisory authority, such as your local data protection authority.
+    </p>
 </div>
 {{/layout}}
diff --git a/templates-translated/ar/about/privacy.html.hbs b/templates-translated/ar/about/privacy.html.hbs
deleted file mode 100644
index 7cd46a1..0000000
--- a/templates-translated/ar/about/privacy.html.hbs
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="about">
-    <center><h2>‫<a href="/about">حول</a> | <a href="/about/news">اﻷخبار</a> | <a href="/about/usage">الاستخدام</a> | <a href="/about/faq">اﻷسئلة الشائعة</a> | <a href="/about/stats">اﻹحصاءات</a> | حماية البيانات‬</h2></center>
-
-    <p style="text-align: left;">‫يقوم خادم المفاتيح الذي يشتغل خلف keys.openpgp.org بمعالجة وتخزين وتوزيع البيانات المتعلقة بمفاتيح OpenPGP. تُعالَج البيانات بطريقة ملائمة لنوعيتها كما يلي :‬</p>
-<ul>
-<li>
-<b>عناوين البريد الإلكتروني</b><p>تتضمن <abbr title="Packet Tag 13">مُعرِّفات المستخدم</abbr> عناوين البريد الإلكتروني، وهذه اﻷخيرة هي معلومات تُمكِّن من تحديد هوية مالكها. لذلك، تُتخَذ احتياطات استثنائية لضمان استخدامها فقط بعد الموافقة على ذلك :‏</p>
-<ul>
-<li>يتطلب نشرها تأكيد <a target="_blank" href="https://fr.wikipedia.org/wiki/Opt_in">الموافقة مرتين</a> وذلك ﻹثبات ملكية عنوان البريد الإلكتروني المقصود.‏</li>
-                      <li>يمكن العثور على عناوين البريد اﻹلكتروني عبر كتابتها بالكامل، وليس فقط بالأسماء المرتبطة بها.‏</li>
-                      <li>لا يمكن عدّ العناوين.‏</li>
-                      <li>‫من الممكن حذف العناوين عبر إثبات يسير لملكيتها، بطريقة تلقائية، تشبه التي استُخدمَت خلال عملية نشرها. إذا تعذر عليك إزالة العنوان، يكفي مراسلتنا عبر البريد اﻹلكتروني : Support في keys نقطة openpgp نقطة org.‬</li>
-                  </ul>
-<p>لا تُعطَى هذه البيانات لأطراف أخرى بشكل مُجمَّع (بيانات مُفرَّغة).‏</p>
-          </li>
-          <li>
-<b>بيانات المفاتيح العمومية</b><p>إن محتويات بيانات التعمية لمفاتيح OpenPGP ليست معلومات مُحدِّدة لهوية مالكيها. يتعلق اﻷمر تحديدا ب<abbr title="Balises de paquet 6 et 14">محتويات المفاتيح العمومية</abbr>، و<abbr title="Balise de paquet 6, types de signature 0x10-0x13, 0x18, 0x19, 0x1F">التوقيعات الذاتية</abbr>، وكذا <abbr title="Balise de paquet 2, types de signature 0x20, 0x28, 0x30">توقيعات النقض</abbr>.</p>
-              <p>في الغالب، لا تكون هذه البيانات متاحة بشكل مُجمَّع (بيانات مُفرَّغة)، لكن يمكن إعطاؤها لأطراف أخرى بغرض التطوير أو إجراء اﻷبحاث.‏</p>
-          </li>
-          <li>
-<b>بيانات معرِّفات المستخدمين اﻷخرى</b><p>‫قد يتضمن مفتاح OpenPGP بيانات شخصية أخرى غير عناوين البريد اﻹلكتروني، مثل <abbr title="Balise de paquet 13">مُعرِّفات المستخدمين</abbr> التي لا تحتوي على عناوين البريد اﻹلكتروني، أو <abbr title="Balise de paquet 17">صفات الصور</abbr>. لذلك، تُزال هذه البيانات خلال الرفع. إذ، لا تُخزَّن ولا تُعالَج ولا تُوزَّع أبدا، في أي حال من اﻷحوال.‬</p>
-              <p>‫إن صنف حزم OpenPGP التي لم يَجْرِ ذكرها تحديدا كما سبق، ستتم إزالتها خلال عملية الرفع. إذ، لا تُخزَّن ولا تُعالَج ولا تُوزَّع، في أي حال من اﻷحوال.‬</p>
-          </li>
-      </ul>
-<p style="text-align: left">لا تُرسَل أبدا أي بيانات لأطراف أخرى غير التي هي متاحة في <a href="/about/api">الواجهة العمومية لبرمجة التطبيقات</a>، بما في ذلك، تلك المذكورة في سياسة المعالجة هذه.‏</p>
-</div>
diff --git a/templates-translated/cs_CZ/about/privacy.html.hbs b/templates-translated/cs_CZ/about/privacy.html.hbs
deleted file mode 100644
index 93c45a5..0000000
--- a/templates-translated/cs_CZ/about/privacy.html.hbs
+++ /dev/null
@@ -1,52 +0,0 @@
-<div class="about">
-    <center><h2>
-<a href="/about">Info</a> | <a href="/about/news">Novinky</a> | <a href="/about/usage">Použití</a>  | <a href="/about/faq">Časté dotazy</a> | <a href="/about/stats">Statistiky</a> | Soukromí</h2></center>
-
-    <p style="text-align: left;">Veřejný server klíčů, který běží na adrese keys.openpgp.org, zpracovává, ukládá , uchovává a
-distribuuje data klíčů OpenPGP. Konkrétní způsob, jakým jsou data zpracovávána
-se liší podle typu takto:</p>
-<ul>
-<li>
-<b>Emailové adresy</b><p>E-mailové adresy obsažené v <abbr title="Packet Tag 13">Uživatelských
-ID</abbr> jsou osobně identifikovatelné údaje (PII).
-Zvláštní pozornost je věnována tomu, aby se zajistilo, že jsou používány pouze se
-souhlasem:</p>
-<ul>
-<li>Vydávání vyžaduje <a target="_blank" href="https://en.wikipedia.org/wiki/Opt-in_email#Confirmed_opt-in_(COI)_/_Double_opt-in_(DOI)">dvojí
-opt-in</a> ověření, aby se prokázalo vlastnictví
-dané e-mailové adresy.</li>
-                      <li>Adresy lze vyhledávat podle přesné e-mailové adresy,
-ale ne podle přidruženého jména.</li>
-                      <li>Výčet adres není možný.</li>
-                      <li>Vymazání adres je možné pomocí jednoduchého důkazu
-o vlastnictví automatizovaným způsobem podobným zveřejnění. Odstranění adresy ze seznamu, pokud výše uvedené není
-možné, napište na adresu support zavináč keys tečka openpgp tečka
-org.</li>
-                  </ul>
-<p>Tyto údaje nejsou nikdy předávány hromadně ("jako dump") třetím
-stranám.</p>
-          </li>
-          <li>
-<b>Data veřejných klíčů</b><p>Kryptografický obsah klíčů OpenPGP se nepovažuje za osobní.
-identifikovatelné informace. Zahrnuje
-<abbr title="Packet Tags 6 and 14">veřejné klíče</abbr>,
-<abbr title="Packet Tag 2, Signature types 0x10-0x13, 0x18, 0x19, 0x1F">self-signatures</abbr> a
-<abbr title="Packet Tag 2, Signature types 0x20, 0x28, 0x30">podpisy revokací</abbr>.</p>
-              <p>Tyto údaje nejsou obvykle hromadně k dispozici ("jako dump"),
-ale mohou být na vyžádání předány třetím osobám.
-stranám pro účely vývoje nebo výzkumu.</p>
-          </li>
-          <li>
-<b>Jiná data uživatelského ID</b><p>Klíč OpenPGP může obsahovat jiné osobní údaje než e-mailové
-adresy, například <abbr title="Packet Tag 13">ID uživatele</abbr>
-které neobsahují e-mailové adresy, nebo <abbr title="Packet Tag 17">obrázkové atributy</abbr>. Tyto údaje jsou odstraněny
-při nahrávání a nikdy se žádným způsobem neukládají, nezpracovávají ani nešíří.</p>
-              <p>OpenPGP pakety, které nebyly výslovně zmíněny výše, jsou
-během nahrávání odstraněny a nikdy nejsou uloženy, zpracovány ani se
-žádným způsobem nešíří.</p>
-          </li>
-      </ul>
-<p style="text-align: left">Data nejsou nikdy předávána třetím stranám mimo těch,
-která jsou dostupná z <a href="/about/api">veřejných rozhraní API</a>
-a těch popsaných v těchto zásadách.</p>
-</div>
diff --git a/templates-translated/de/about/privacy.html.hbs b/templates-translated/de/about/privacy.html.hbs
deleted file mode 100644
index 71a9bc0..0000000
--- a/templates-translated/de/about/privacy.html.hbs
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="about">
-    <center><h2>
-<a href="/about">Über</a> | <a href="/about/news">News</a> | <a href="/about/usage">Nutzung</a> | <a href="/about/faq">FAQ</a> | <a href="/about/stats">Statistik</a> | Privacy Policy</h2></center>
-
-    <p style="text-align: left;">Der öffentliche Schlüsselserver, der auf keys.openpgp.org läuft, verarbeitet, speichert und
-verteilt OpenPGP-Schlüssel-Daten. Die konkrete Art der Verarbeitung
-unterscheidet sich je nach Typ wie folgt:</p>
-<ul>
-<li>
-<b>E-Mail Adressen</b><p>E-Mail Adressen, die in <abbr title="Packet Tag 13">Nutzer IDs</abbr> enthalten sind, sind personenbezogene Informationen.
-Es wird besonders darauf geachtet, dass diese nur mit einer Einwilligung verarbeitet werden.</p>
-<ul>
-<li>Das Veröffentlichen benötigt eine <a target="_blank" href="https://en.wikipedia.org/wiki/Opt-in_email#Confirmed_opt-in_(COI)_/_Double_opt-in_(DOI)">Double-Opt-In</a> Bestätigung, um den Besitz der fraglichen E-Mail Adresse nachzuweisen.</li>
-                      <li>Adressen kann man über die exakte E-Mail Adresse suchen,
-nicht aber über den damit verbundenen Namen.</li>
-                      <li>Das Auflisten von Adressen ist nicht möglich.</li>
-                      <li>Das Löschen von Adressen ist über einen einfachen Besitznachweis, ähnlich wie beim Veröffentlichen, möglich. Um eine Adresse zu entfernen bei der das nicht möglich ist, wenden sie sich bitte an support at keys Punkt openpgpg Punkt org.</li>
-                  </ul>
-<p>Diese Daten werden niemals gesammelt (als "Dump") an Dritte weitergegeben.</p>
-          </li>
-          <li>
-<b>Öffentliche Schlüssel</b><p>Der kryptografische Inhalt von OpenPGP-Schlüssel wird nicht als personenbezogene Informationen gewertet. Das beinhaltet besonders
-<abbr title="Packet Tags 6 and 14">Material öffentlicher Schlüssel</abbr>,
-<abbr title="Packet Tag 2, Signature types 0x10-0x13, 0x18, 0x19, 0x1F">eigene Signaturen</abbr> und
-<abbr title="Packet Tag 2, Signature types 0x20, 0x28, 0x30">Widerrufssignaturen</abbr>.</p>
-              <p>Diese Daten sind normalerweise nicht gesammelt (als "Dump") verfügbar, können aber bei Anforderung an Dritte zum Zweck der Weiterentwicklung oder Forschung weitergegeben werden.</p>
-          </li>
-          <li>
-<b>Andere Benutzerkennungen</b><p>Ein OpenPGP Schlüssel kann andere persönliche Daten als E-Mail Adressen wie <abbr title="Packet Tag 13">Benutzerkennungen</abbr>, die keine E-Mail Adressen enthalten, oder <abbr title="Packet Tag 17">Bildanhänge</abbr> enthalten. Diese Daten werden beim Hochladen entfernt und niemals in irgend einer Weise gespeichert, verarbeitet oder weitergegeben.</p>
-              <p>OpenPGP Packet-Typen die nicht explizit oben genannt wurden werden beim Hochladen entfernt sowie nie gespeichert, verarbeitet oder in irgendeiner Form weitergegeben.</p>
-          </li>
-      </ul>
-<p style="text-align: left">Daten werden niemals an Dritte außerhalb des Bereichs der <a href="/about/api">öffentlichen API Schnittstellen</a> und wie dieser Richtlinie beschrieben weitergegeben.</p>
-</div>
diff --git a/templates-translated/es/about/privacy.html.hbs b/templates-translated/es/about/privacy.html.hbs
deleted file mode 100644
index 4d5aedc..0000000
--- a/templates-translated/es/about/privacy.html.hbs
+++ /dev/null
@@ -1,51 +0,0 @@
-<div class="about">
-    <center><h2>
-<a href="/about">Acerca</a> | <a href="/about/news">Noticias</a> | <a href="/about/usage">Cómo usar</a> | <a href="/about/faq">FAQ</a> | <a href="/about/stats">Estadísticas</a> | Privacidad</h2></center>
-
-    <p style="text-align: left;">El servidor público que funciona en keys.openpgp.org procesa, almacena y distribuye datos de claves OpenPGP. La manera específica en que se procesan los datos difiere por tipo, de esta manera:</p>
-<ul>
-<li>
-<b>Direcciones de correo</b><p>Las direcciones de correo contenidas en los <abbr title="Packet Tag 13">User
-                      IDs</abbr> son información personal identificable (PII).
-                  Tenemos cuidado de que sólo se usen con consentimiento:</p>
-<ul>
-<li>Publicar requiere <a target="_blank" href="https://en.wikipedia.org/wiki/Opt-in_email#Confirmed_opt-in_(COI)_/_Double_opt-in_(DOI)">doble
-confirmación</a>, para corroborar la propiedad del
-correo electrónico en cuestión.</li>
-                      <li>Puedes buscar direcciones por la dirección de correo electrónico exacta
-pero no por nombre asociado.</li>
-                      <li>Enumerar las direcciones no es posible.</li>
-                      <li>Eliminar direcciones es posible mediante una simple prueba
-de propiedad en una forma particular automatizada, similar a
-publicarla. Para eliminar una dirección donde no es
-posible, escriba a soporte en keys dot openpgp dot
-org.</li>
-                  </ul>
-<p>Estos datos nunca son entregados colectivamente ("como un vertedero")
-a terceros.</p>
-          </li>
-          <li>
-<b>Información de Clave Pública</b><p>EL contenido criptográfico de las claves OpenPGP no es considerado Información
-                  Personal Identificable. Esto incluye específicamente
-                  <abbr title="Packet Tags 6 and 14">material de clave pública</abbr>,
-                  <abbr title="Packet Tag 2, Signature types 0x10-0x13, 0x18, 0x19, 0x1F">auto-firmas</abbr>, y
-                  <abbr title="Packet Tag 2, Signature types 0x20, 0x28, 0x30">firmas de revocación</abbr>.</p>
-              <p>Estos datos usualmente no están disponibles colectivamente ("como
-un vertedero"), pero pueden ser entregados mediante una solicitud
-a terceros con propósitos de desarrollo o investigación.</p>
-          </li>
-          <li>
-<b>Otros datos de identificación de usuario</b><p>Una clave OpenPGP puede contener datos personales además de la dirección
-de correo electrónico, tales como<abbr title="Packet Tag 13">IDs de Usuario</abbr>
-que no contienen direcciones de correo electrónico, o <abbr title="Packet Tag 17">atributos de imagen</abbr>. Estos datos son extraídos
-durante la subida y nunca son almacenados, procesados, o distribuidos de
-cualquier forma.</p>
-              <p>Los tipos de paquetes OpenPGP que no fueron específicamente mencionados arriba son
-extraídos durante la subida y nunca son almacenados, procesados o
-distribuidos de cualquier forma.</p>
-          </li>
-      </ul>
-<p style="text-align: left">Los datos nunca son dados a terceros a excepción de
-lo que está disponible desde las<a href="/about/api">interfaces publicas de la API</a>,
-Y lo que es descrito en esta política.</p>
-</div>
diff --git a/templates-translated/fr/about/privacy.html.hbs b/templates-translated/fr/about/privacy.html.hbs
deleted file mode 100644
index 01d8a30..0000000
--- a/templates-translated/fr/about/privacy.html.hbs
+++ /dev/null
@@ -1,27 +0,0 @@
-<div class="about">
-    <center><h2>
-<a href="/about">À propos</a> | <a href="/about/news">Nouvelles</a> | <a href="/about/usage">Utilisation</a> | <a href="/about/faq">FAQ</a> | <a href="/about/stats">Statistiques</a> | Protection des données</h2></center>
-
-    <p style="text-align: left;">Le serveur de clés public derrière keys.openpgp.org traite, stocke et distribue les données des clés OpenPGP. La façon particulière dont les données sont traitées diffère selon le type, comme suit :</p>
-<ul>
-<li>
-<b>Adresses courriel</b><p>Les adresses courriel comprises dans les <abbr title="Packet Tag 13">ID utilisateur</abbr> sont des renseignements qui permettent d’identifier leur détenteur. Des précautions particulières sont prises pour garantir qu’elles ne sont utilisées qu’avec consentement :</p>
-<ul>
-<li>Leur publication exige une confirmation par <a target="_blank" href="https://fr.wikipedia.org/wiki/Opt_in">double consentement</a> afin de prouver la propriété de l’adresse courriel en question.</li>
-                      <li>Seules les adresses courriel exactes peuvent être cherchées, pas les noms associés.</li>
-                      <li>Il n’est pas possible d’énumérer les adresses.</li>
-                      <li>La suppression d’adresses est possible avec une simple preuve de propriété, de façon automatisée, comme pour la publication. Afin de retirer une adresse quand cela n’est pas possible, envoyez un courriel à support arobase keys point openpgp point org.</li>
-                  </ul>
-<p>Ces données ne sont jamais remises à des tiers en bloc (vidage de données).</p>
-          </li>
-          <li>
-<b>Données de clés publiques</b><p>Le contenu cryptographique de clés OpenPGP n’est pas considéré comme des renseignements qui permettent d’identifier les détenteurs des clés. Cela comprend plus particulièrement les <abbr title="Balises de paquet 6 et 14">contenus de clés publiques</abbr>, les <abbr title="Balise de paquet 6, types de signature 0x10-0x13, 0x18, 0x19, 0x1F">autosignatures</abbr> et les <abbr title="Balise de paquet 2, types de signature 0x20, 0x28, 0x30">signatures de révocation</abbr>.</p>
-              <p>Ces données ne sont habituellement pas disponibles en bloc (vidage de données), mais pourraient être remises sur demande à des tiers à des fins de développement ou de recherche.</p>
-          </li>
-          <li>
-<b>Autres données d’ID utilisateur</b><p>Une clé OpenPGP peut comprendre des données personnelles autres que des adresses courriel, telles que les <abbr title="Balise de paquet 13">ID utilisateur</abbr> qui ne comprennent pas d’adresses courriel, ou les <abbr title="Balise de paquet 17">attributs d’image</abbr>. Ces données sont retirées lors du téléversement et ne sont jamais enregistrées, traitées, ni distribuées d’aucune façon.</p>
-              <p>Les types de paquets OpenPGP qui ne sont pas spécifiquement mentionnés ci-dessus sont retirés lors du téléversement et ne sont jamais enregistrés, traités, ni distribués d’aucune façon.</p>
-          </li>
-      </ul>
-<p style="text-align: left">Aucune donnée n’est jamais transmise à des tiers outre ce qui est disponible dans les <a href="/about/api"> interfaces publiques de l’API</a>, ainsi que ce qui est décrit dans cette politique.</p>
-</div>
diff --git a/templates-translated/it/about/privacy.html.hbs b/templates-translated/it/about/privacy.html.hbs
deleted file mode 100644
index 35f1aee..0000000
--- a/templates-translated/it/about/privacy.html.hbs
+++ /dev/null
@@ -1,45 +0,0 @@
-<div class="about">
-    <center><h2>
-<a href="/about">About</a> | <a href="/about/news">Novità</a> | <a href="/about/usage">Guida all'uso</a> | <a href="/about/faq">FAQ</a> | <a href="/about/stats">Statistiche</a> | Privacy</h2></center>
-
-    <p style="text-align: left;">Il keyserver pubblico su keys.openpgp.org elabora, immagazzina e
-distribuisce dati delle chiavi OpenPGP. Il modo specifico in cui i dati vengono elaborati
-differisce per ogni tipo come segue:</p>
-<ul>
-<li>
-<b>Indirizzi email</b><p>Gli indirizzi email contenuti negli <abbr title="Packet Tag 13">User IDs</abbr> sono dati identificativi (DI).
-Particolare cura è posta per essere sicuri che siano usati solo con
-l'espresso consenso:</p>
-<ul>
-<li>Pubblicare richiede una verifica a <a target="_blank" href="https://en.wikipedia.org/wiki/Opt-in_email#Confirmed_opt-in_(COI)_/_Double_opt-in_(DOI)">doppio opt-in</a>, per dimostrare il possesso
-dell'indirizzo email in questione.</li>
-                      <li>Gli indirizzi sono ricercabili per indirizzo email esatto,
-ma non per nome associato.</li>
-                      <li>L'elencazione degli indirizzi non è possibile.</li>
-                      <li>La cancellazione degli indirizzi è possibile con una semplice prova della proprietà tramite un processo automatico, simile alla pubblicazione. Per rimuovere un indirizzo quando ciò non sia possibile, scrivere a support chiocciola keys punto openpgp punto org.</li>
-                  </ul>
-<p>Questi dati non sono mai forniti collettivamente ("come un dump") a terze parti.</p>
-          </li>
-          <li>
-<b>Dati della chiave pubblica</b><p>Il contenuto crittografico delle chiavi OpenPGP non è considerato
-come un dato identificativo. Questo include specificamente
-<abbr title="Packet Tags 6 and 14">materiale della chiave pubblica</abbr>,
-<abbr title="Packet Tag 2, Signature types 0x10-0x13, 0x18, 0x19, 0x1F">auto-firma</abbr>, and
-<abbr title="Packet Tag 2, Signature types 0x20, 0x28, 0x30">firme di revoca</abbr>.</p>
-              <p>Questi dati non sono disponibili collettivamente ("come un dump"), ma possono essere forniti dietro richiesta a terze parti per scopo di ricerca e sviluppo.</p>
-          </li>
-          <li>
-<b>Altri dati dell'User ID</b><p>Una chiave OpenPGP può contenere daiti personali oltre all'indirizzo email
-, quali <abbr title="Packet Tag 13">User IDs</abbr>
-che non contengono indirizzi email, o <abbr title="Packet Tag 17">attributi immagine</abbr>. Questi dati sono estrapolati
-durante il caricamento e mai conservati, elaborati o distribuiti in
-alcun modo.</p>
-              <p>I tipi di pacchetto OpenPGP che non sono specificamente sovramenzionati sono
-estrapolati durante il caricamento e mai conservati, elaborati o
-distribuiti in alcun modo.</p>
-          </li>
-      </ul>
-<p style="text-align: left">I dati non sono mai forniti a terze parti in altro modo fuori da
-quanto disponibile tramite le <a href="/about/api">interfacce API pubblicamente disponibili</a>,
-e quello che è descritto in questa policy.</p>
-</div>
diff --git a/templates-translated/ja/about/privacy.html.hbs b/templates-translated/ja/about/privacy.html.hbs
deleted file mode 100644
index e5a06d1..0000000
--- a/templates-translated/ja/about/privacy.html.hbs
+++ /dev/null
@@ -1,43 +0,0 @@
-<div class="about">
-    <center><h2>
-<a href="/about">このサイトについて</a> | <a href="/about/news">ニュース</a> | <a href="/about/usage">使い方</a> | <a href="/about/faq">FAQ</a> | <a href="/about/stats">統計</a> | プライバシ</h2></center>
-
-    <p style="text-align: left;">keys.openpgp.org 上の公開鍵サーバは OpenPGP 鍵のデータを処理、保存、配信します。
-データを処理する具体的な方式は次のタイプによって異なります。</p>
-<ul>
-<li>
-<b>メールアドレス</b><p><abbr title="Packet Tag 13">ユーザID</abbr>に保存されているメールアドレスは個人識別情報（PII）であります。
-この情報は同意なしに使われないよう、格別に留意しております。</p>
-<ul>
-<li>鍵を公開するときには、本人のメールアドレスであることを確認するために、
-<a target="_blank" href="https://en.wikipedia.org/wiki/Opt-in_email#Confirmed_opt-in_(COI)_/_Double_opt-in_(DOI)">認証のメール</a>をお送りします。</li>
-                      <li>メールアドレスによる検索のためには、メールの一部分だけではない
-メールアドレス全体をそのまま入力する必要があります。
-名前から鍵を検索することはできません。</li>
-                      <li>メールアドレスを列挙することはできません。</li>
-                      <li>メールアドレスを削除するときも、公開の時のように、メールアドレスが
-本人のものであることを簡単に認証し、削除することができます。
-この方法による削除ができない場合、support at keys dot openpgp dot org宛に
-サポートメールを送ってください。</li>
-                  </ul>
-<p>このデータが（一括的に）サードパーティのものに渡されることはありません。</p>
-          </li>
-          <li>
-<b>公開鍵データ</b><p>OpenPGP 鍵の暗号化された内容は個人識別情報として扱われません。
-具体的にはこれらのものが含まれます：
-<abbr title="Packet Tags 6 and 14">公開鍵の資料</abbr>
-<abbr title="Packet Tag 2, Signature types 0x10-0x13, 0x18, 0x19, 0x1F">自己署名</abbr>
-<abbr title="Packet Tag 2, Signature types 0x20, 0x28, 0x30">破棄の署名</abbr></p>
-              <p>このデータは普通、（一括的に）渡されませんが、
-開発や研究を目的にするサードパーティのリクエストに限り提供される場合があります。</p>
-          </li>
-          <li>
-<b>ほかのユーザ ID データ</b><p>OpenPGP 鍵はメールアドレスが含まれない<abbr title="Packet Tag 13">ユーザ ID</abbr> や<abbr title="Packet Tag 17">画像</abbr>などの、
-メールアドレス以外の個人のデータを含んでいる可能性があります。
-このデータはアップロードする際に排除され、どの場合にも保存、処理、配信されません。</p>
-              <p>上の方に言及されていない OpenPGP パケットタイプはアップロードの際に排除され、
-どの場合にも保存、処理、配信されません。</p>
-          </li>
-      </ul>
-<p style="text-align: left">データは<a href="/about/api">公開 API インタフェース</a>やポリシーに記述されていないサードパーティには提供されません。</p>
-</div>
diff --git a/templates-translated/ko/about/privacy.html.hbs b/templates-translated/ko/about/privacy.html.hbs
deleted file mode 100644
index f05ac9e..0000000
--- a/templates-translated/ko/about/privacy.html.hbs
+++ /dev/null
@@ -1,27 +0,0 @@
-<div class="about">
-    <center><h2>
-<a href="/about">서비스 소개</a> | <a href="/about/news">새 소식</a> | <a href="/about/usage">사용 안내</a> | <a href="/about/faq">자주 묻는 질문</a> | <a href="/about/stats">통계</a> | 개인 정보 보호</h2></center>
-
-    <p style="text-align: left;">keys.openpgp.org 도메인에서 동작하는 공공 키서버는 OpenPGP 키 데이터를 처리, 저장, 배포합니다.  어떤 데이터가 어떻게 처리되는지는 해당 데이터 종류에 따라 달라집니다.</p>
-<ul>
-<li>
-<b>전자 메일 주소</b><p><abbr title="패킷 태그 13번">사용자 ID</abbr>에 포함된 전자 메일 주소는 개개인을 특정할 수 있는 개인 정보입니다. 따라서 해당 개인 정보는 다음과 같은 특수 절차를 거쳐 오로지 본인 동의가 있어야만 사용 가능하도록 처리됩니다:</p>
-<ul>
-<li>해당 전자 메일 주소는 <a target="_blank" href="https://en.wikipedia.org/wiki/Opt-in_email#Confirmed_opt-in_(COI)_/_Double_opt-in_(DOI)">참여 이중 확인</a> 절차를 통해 주소 소유권을 인증해야만 공개할 수 있습니다.</li>
-                      <li>주소는 연관된 이름만으로는 찾을 수 없고, 오로지 완전한 전자 메일 주소로만 찾을 수 있습니다.</li>
-                      <li>연관 없는 여러 주소를 한 번에 얻어낼 수는 없습니다.</li>
-                      <li>주소 정보를 지우는 건 자동화된 간단한 소유권 인증 절차를 통해 가능합니다. 만약 이게 불가능한 상황이라면 support 골뱅이 keys 닷 openpgp 닷 org 주소로 도움을 요청하세요.</li>
-                  </ul>
-<p>이 개인 정보는 절대로 제삼자에게 '데이터 뭉치'의 형태로 전달되지 않습니다.</p>
-          </li>
-          <li>
-<b>공개키 데이터</b><p>OpenPGP 키의 암호학적 데이터는 개인 정보로 간주되지 않습니다. 암호학적 데이터란 <abbr title="패킷 태그 6번과 14번">공개키 정보</abbr>, <abbr title="패킷 태그 2번, 서명 타입 0x10-0x13, 0x18, 0x19, 0x1F">자가 서명</abbr>, 그리고 <abbr title="패킷 태그 2번, 서명 타입 0x20, 0x28, 0x30">철회 서명</abbr>을 의미합니다.</p>
-              <p>이 데이터는 대개의 경우 '데이터 뭉치'의 형태로 제공되지는 않습니다만, 연구 및 개발 목적으로 요청이 들어올 경우 제공될 수도 있습니다.</p>
-          </li>
-          <li>
-<b>기타 사용자 ID 데이터</b><p>OpenPGP 키는 전자 메일 주소 이외의 개인 정보를 담고 있을 수 있습니다. 이러한 정보에는 전자 메일 주소가 아닌 <abbr title="패킷 태그 13번">사용자 ID</abbr>, <abbr title="패킷 태그 17번">이미지 데이터</abbr> 등이 있습니다. 이러한 데이터는 올리기 과정에서 미리 제거됩니다. 따라서 절대로 저장·처리·배포되지 않습니다.</p>
-              <p>위에서 명시적으로 언급하지 않은 OpenPGP 패킷 타입은 올리기 과정에서 미리 제거됩니다. 따라서 절대로 저장·처리·배포되지 않습니다.</p>
-          </li>
-      </ul>
-<p style="text-align: left">위에서 언급한 데이터 제공 방식과 <a href="/about/api">공개 API 인터페이스</a>에서 접근 가능한 범위 외적으로는 제삼자에게 데이터를 제공하지 않습니다.</p>
-</div>
diff --git a/templates-translated/nl/about/privacy.html.hbs b/templates-translated/nl/about/privacy.html.hbs
deleted file mode 100644
index c5e456b..0000000
--- a/templates-translated/nl/about/privacy.html.hbs
+++ /dev/null
@@ -1,52 +0,0 @@
-<div class="about">
-    <center><h2>
-<a href="/about">Over</a> | <a href="/about/news">Nieuws</a> | <a href="/about/usage">Gebruik</a> | <a href="/about/faq">FAQ</a> | <a href="/about/stats">Statistieken</a> | Privacy</h2></center>
-
-    <p style="text-align: left;">De openbare sleutelserver die draait op keys.openpgp.org verwerkt, bewaard en
-verspreidt OpenPGP-sleutelgegevens. De specifieke manier waarop gegevens worden verwerkt
-verschilt per type als volgt:</p>
-<ul>
-<li>
-<b>E-mailadressen</b><p>E-mailadressen in <abbr title="Packet Tag 13">Gebruiker
-ID's</abbr> zijn persoonlijk identificeerbare informatie (PII).
-Er wordt speciaal op gelet dat ze alleen worden gebruikt met
-toestemming:</p>
-<ul>
-<li>Publicatie vereist <a target="_blank" href="https://en.wikipedia.org/wiki/Opt-in_email#Confirmed_opt-in_(COI)_/_Double_opt-in_(DOI)">dubbelle
-opt-in</a> validatie, als bewijs van eigendom van het
-e-mailadres in kwestie.</li>
-                      <li>Adressen zijn doorzoekbaar op exact e-mailadres,
-maar niet met bijbehorende naam.</li>
-                      <li>Opsomming van adressen is niet mogelijk.</li>
-                      <li>Het verwijderen van adressen is mogelijk via eenvoudig bewijs
-van eigendom op een geautomatiseerde manier, vergelijkbaar met
-publicatie. Om een adres te verwijderen waar dit niet mogelijk is,
-schrijf naar support apenstaartje keys punt openpgp punt
-org.</li>
-                  </ul>
-<p>Deze gegevens worden nooit collectief ("als een dump") aan derden partijen 
-overgedragen.</p>
-          </li>
-          <li>
-<b>Openbare sleutels gegevens</b><p>De cryptografische inhoud van OpenPGP-sleutels wordt niet persoonlijk beschouwd
-identificeerbare informatie. Dit omvat specifiek
-<abbr title="Packet Tags 6 and 14">openbare sleutel gegevens</abbr>,
-<abbr title="Packet Tag 2, Signature types 0x10-0x13, 0x18, 0x19, 0x1F">zelfhandtekeningen</abbr> en
-<abbr title="Packet Tag 2, Signature types 0x20, 0x28, 0x30">intrekkingshandtekeningen</abbr>.</p>
-              <p>Deze gegevens zijn meestal niet collectief beschikbaar ("als
-een dump"), maar kan op verzoek aan derden partijen worden overhandigd
-voor ontwikkelingsdoeleinden of onderzoek.</p>
-          </li>
-          <li>
-<b>Andere gebruikers-ID-gegevens</b><p>Een OpenPGP-sleutel kan andere persoonlijke gegevens dan
-e-mailadressen, zoals <abbr title="Packet Tag 13">gebruikers-ID's</abbr>
-die geen e-mailadressen zijn of <abbr title="Packet Tag 17">afbeeldingskenmerken</abbr> bevatten. Deze gegevens worden gestript
-tijdens het uploaden en nooit opgeslagen, verwerkt of gedistribueerd op
-welke manier dan ook.</p>
-              <p>OpenPGP-pakkettypen die hierboven niet specifiek zijn genoemd, worden
-gestript tijdens het uploaden en nooit opgeslagen, verwerkt of
-verdeeld op welke manier dan ook.</p>
-          </li>
-      </ul>
-<p style="text-align: left">Gegevens worden nooit gedeeld met derden buiten wat beschikbaar is via de <a href="/about/api">openbare API-interfaces</a> en wat wordt beschreven in dit beleid.</p>
-</div>
diff --git a/templates-translated/ro/about/privacy.html.hbs b/templates-translated/ro/about/privacy.html.hbs
deleted file mode 100644
index 9e07f47..0000000
--- a/templates-translated/ro/about/privacy.html.hbs
+++ /dev/null
@@ -1,54 +0,0 @@
-<div class="about">
-    <center><h2>
-<a href="/about">Despre</a> | <a href="/about/news">Știri</a> | <a href="/about/usage">Utilizare</a> | <a href="/about/faq">FAQ</a> | <a href="/about/stats">Statistici</a> | Confidențialitate</h2></center>
-
-    <p style="text-align: left;">Serverul de chei publice care rulează pe keys.openpgp.org procesează, stochează și
-        distribuie datele de chei OpenPGP. Modul specific în care sunt procesate datele
-        diferă în funcție de tip, după cum urmează:</p>
-<ul>
-<li>
-<b>Adrese de e-mail</b><p>Adresele de e-mail conținute în <abbr title="Packet Tag 13">User
-                      ID-uri</abbr> sunt informații de identificare personală(PII).
-                  Se acordă o atenție deosebită pentru a ne asigura că acestea sunt utilizate numai cu
-                  consimțământ:</p>
-<ul>
-<li>Publicarea necesită o <a target="_blank" href="https://en.wikipedia.org/wiki/Opt-in_email#Confirmed_opt-in_(COI)_/_Double_opt-in_(DOI)">dublă
-                              opt-in</a> pentru a dovedi proprietatea asupra
-                          adresa de e-mail în cauză.</li>
-                      <li>Adresele pot fi căutate după adresa de e-mail exactă,
-                          dar nu și după numele asociat.</li>
-                      <li>Enumerarea adreselor nu este posibilă.</li>
-                      <li>Ștergerea adreselor este posibilă printr-o dovadă simplă
-                          de proprietate în mod automat, similar cu
-                          publicarea. Pentru a scoate de pe listă o adresă în cazul în care acest lucru nu este
-                          posibilă, scrieți la support at keys dot openpgp dot
-                          org.</li>
-                  </ul>
-<p>Aceste date nu sunt niciodată transmise în mod colectiv ("ca un dumping") către terțe
-                  părți.</p>
-          </li>
-          <li>
-<b>Date privind cheia publică</b><p>TConținutul criptografic al cheilor OpenPGP nu este luat în considerare personal.
-                  identificabile. Aceasta include în mod specific
-                  <abbr title="Packet Tags 6 and 14">materialul cheii publice</abbr>,
-                  <abbr title="Packet Tag 2, Signature types 0x10-0x13, 0x18, 0x19, 0x1F">semnăturile proprii</abbr>, și
-                  <abbr title="Packet Tag 2, Signature types 0x20, 0x28, 0x30">semnăturile de revocare</abbr>.</p>
-              <p>Aceste date nu sunt de obicei disponibile în mod colectiv ("ca
-                  ca un dumping"), dar pot fi transmise, la cerere, unor terți.
-                  părților terțe în scopuri de dezvoltare sau de cercetare.</p>
-          </li>
-          <li>
-<b>Alte date ID utilizator</b><p>O cheie OpenPGP poate conține date cu caracter personal, altele decât
-                  adrese de e-mail, cum ar fi <abbr title="Packet Tag 13">User IDs</abbr>
-                  care nu conțin adrese de e-mail sau <abbr title="Packet Tag 17">atribute de imagine</abbr>. Aceste date sunt eliminate
-              în timpul încărcării și nu sunt niciodată stocate, procesate sau distribuite în
-              niciun fel.</p>
-              <p>Tipurile de pachete OpenPGP care nu au fost menționate în mod specific mai sus sunt
-                  sunt eliminate în timpul încărcării și nu sunt niciodată stocate, procesate sau
-                  distribuite în niciun fel.</p>
-          </li>
-      </ul>
-<p style="text-align: left">Datele nu sunt niciodată transmise unor terțe părți în afara
-         ceea ce este disponibil prin <a href="/about/api">interfețele API publice</a>,
-          și ceea ce este descris în această politică.</p>
-</div>
diff --git a/templates-translated/sv/about/privacy.html.hbs b/templates-translated/sv/about/privacy.html.hbs
deleted file mode 100644
index 47673ba..0000000
--- a/templates-translated/sv/about/privacy.html.hbs
+++ /dev/null
@@ -1,54 +0,0 @@
-<div class="about">
-    <center><h2>
-<a href="/about">Om</a> | <a href="/about/news">Nyheter</a> | <a href="/about/usage">Använda</a> | <a href="/about/faq">FAQ</a> | <a href="/about/stats">Statistik</a> | Integritet</h2></center>
-
-    <p style="text-align: left;">Den publika nyckelserver som körs på keys.openpgp.org bearbetar, lagrar och
-        distribuerar OpenPGP-nyckeldata. Det specifika sättet informationen bearbetas på
-        skiljer sig åt efter typ enligt följande:</p>
-<ul>
-<li>
-<b>E-postadresser</b><p>E-postadresser som ingår i <abbr title="Packet Tag 13">användar-
-                      ID:n</abbr> är personligt identifierbar information (PII).
-                  Stor vikt läggs vid att säkerställa att de endast används med
-                  samtycke:</p>
-<ul>
-<li>Publicering kräver <a target="_blank" href="https://en.wikipedia.org/wiki/Opt-in_email#Confirmed_opt-in_(COI)_/_Double_opt-in_(DOI)">dubbel
-                              opt-in</a>-bekräftelse, för att bevisa att
-                          e-postadressen i fråga ägs av användaren.</li>
-                      <li>Adresser är sökbara via exakt e-postadress,
-                          men inte via associerat namn.</li>
-                      <li>Att lista adresser är inte möjligt.</li>
-                      <li>Att radera adresser är möjligt genom att på ett enkelt sätt
-                          bevisa att adressen ägs via en automatisk metod, liknande den
-                          vid publicering. För att avlista en adress där detta inte
-                          är möjligt, skriv till support at keys dot openpgp dot
-                          org.</li>
-                  </ul>
-<p>Denna information lämnas aldrig över kollektivt ("som en dump") till
-                  tredjepart.</p>
-          </li>
-          <li>
-<b>Publik nyckel-information</b><p>Det kryptografiska innehållet i OpenPGP-nycklar anses inte vara personligt
-                  identifierbar information. Detta innefattar specifikt
-                  <abbr title="Packet Tags 6 and 14">publik nyckel-material</abbr>,
-                  <abbr title="Packet Tag 2, Signature types 0x10-0x13, 0x18, 0x19, 0x1F">egen-signaturer</abbr> och
-                  <abbr title="Packet Tag 2, Signature types 0x20, 0x28, 0x30">återkallelse-signaturer</abbr>.</p>
-              <p>Denna information är typiskt sett inte tillgänglig tillsammans (”som
-                  en dump”), men kan efter begäran lämnas ut till tredjepart 
-                  i utvecklings- eller forskningssyfte.</p>
-          </li>
-          <li>
-<b>Övrig användar-ID-data</b><p>En OpenPGP-nyckel kan innehålla annan personlig information utöver
-                  e-postadresser, så som <abbr title="Packet Tag 13">användar-ID:n</abbr>
-                  som inte innehåller e-postadresser, eller <abbr title="Packet Tag 17">bildattribut</abbr>. Denna information
-              tas bort vid uppladdning och lagras, bearbetas eller distribueras inte
-              på något sätt.</p>
-              <p>Typer av OpenPGP-paket som inte nämns specifikt ovan tas bort
-                 vid uppladdning och lagras, bearbetas eller distribueras
-                  inte på något sätt.</p>
-          </li>
-      </ul>
-<p style="text-align: left">Data vidarebefordras aldrig till tredjepart förutom det
-          som är tillgängligt från de <a href="/about/api">publika API-gränssnitten</a>,
-          och vad som beskrivs i denna policy.</p>
-</div>
diff --git a/templates-translated/tr/about/privacy.html.hbs b/templates-translated/tr/about/privacy.html.hbs
deleted file mode 100644
index f580fb3..0000000
--- a/templates-translated/tr/about/privacy.html.hbs
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="about">
-    <center><h2>
-<a href="/about">Hakkında</a> | <a href="/about/news">Haberler</a> | <a href="/about/usage">Kullanım</a> | <a href="/about/faq">SSS</a> | <a href="/about/stats">İstatistikler</a> | Mahremiyet</h2></center>
-
-    <p style="text-align: left;">keys.openpgp.org adresinde sunulan herkese açık anahtar sunucusu OpenPGP anahtar verisini işler, saklar ve dağıtır. Verinin nasıl işlendiği verinin türüne göre aşağıdaki şekilde değişmektedir:</p>
-<ul>
-<li>
-<b>E-posta Adresleri</b><p><abbr title="Packet Tag 13">Kullanıcı ID</abbr> içerisindeki e-posta adresleri kişileri tanımlamak için kullanılabilecek bir bilgidir. Sadece kullanıcının rızasıyla kullanıldığından emin olmak için özel bir çaba gösterilmektedir:</p>
-<ul>
-<li>Yayınlanması, söz konusu e-posta adresinin sahibi olduğunu kanıtlamak amacıyla <a target="_blank" href="https://en.wikipedia.org/wiki/Opt-in_email#Confirmed_opt-in_(COI)_/_Double_opt-in_(DOI)">iki aşamalı katılım</a> gerektiren bir doğrulama gerektirir.</li>
-                      <li>Adresler, bütün adres kullanılarak aranabilse de, ilişkiili isimle aranmaları mümkün değildir.</li>
-                      <li>Adreslerin listelenmesi mümkün değildir.</li>
-                      <li>Adreslerin silinmesi, yayınlamaya benzer bir şekilde, kolay bir otomatik sahibi olduğunu kanıtlama yöntemiyle mümkündür. Bu yöntemin mümkün olmadığı bir adresi kaldırmak için support at dot openpgp dot org adresine bir mesaj gönderebilirsiniz.</li>
-                  </ul>
-<p>Bu veri hiç bir zaman toplu olarak ("döküm olarak") üçüncü partilere verilmemektedir.</p>
-          </li>
-          <li>
-<b>Açık Anahtar Verisi</b><p>OpenPGP anahtarlarının kriptografik içeriği kişiyi tanımlayabilecek bir bilgi olarak değerlendirilmemektedir. Bu veri özellikle
-<abbr title="Packet Tags 6 and 14">açık anahtar malzemesini</abbr>
-<abbr title="Packet Tag 2, Signature types 0x10-0x13, 0x18, 0x19, 0x1F">kişi imzalarını</abbr>, ve
-<abbr title="Packet Tag 2, Signature types 0x20, 0x28, 0x30">fesih imzalarını</abbr> içeriyor.</p>
-              <p>Bu veri genellikle toplu olarak ("döküm olarak") mevcut değil ama talep doğrultusunda araştırma amacıyla üçüncü partilere verilebilir.</p>
-          </li>
-          <li>
-<b>Diğer Kullanıcı ID verisi</b><p>Bir OpenPGP anahtarı, e-posta adresi dışında, e-posta adresi içermeyen <abbr title="Packet Tag 13">Kullanıcı ID</abbr> veya <abbr title="Packet Tag 17">resim özellikleri</abbr> gibi kimi kişisel bilgiyi içerebilir. Bu veriler yükleme sırasında kaldırılıyor ve hiç bir zaman, hiç bir şekilde saklanmıyor, işlenmiyor veya dağıtılmıyor.</p>
-              <p>Yukarı özellikle belirtilmeyen OpenPGP paket türleri yükleme sırasında kaldırılıyor ve hiç bir zaman, hiç bir şekilde saklanmıyor, işlenmiyor veya dağıtılmıyor.</p>
-          </li>
-      </ul>
-<p style="text-align: left">Bu sayfada tanımlananlar ve <a href="/about/api">herkese açık API arayüzlerinin</a>sunduklarının dışındaki hiç bir veri üçüncü partilere aktarılmıyor.</p>
-</div>
diff --git a/templates-untranslated/about/privacy.html.hbs b/templates-untranslated/about/privacy.html.hbs
index 3cf5ff3..415f1b5 100644
--- a/templates-untranslated/about/privacy.html.hbs
+++ b/templates-untranslated/about/privacy.html.hbs
@@ -1,66 +1,102 @@
 <div class="about">
     <center><h2><a href="/about">About</a> | <a href="/about/news">News</a> | <a href="/about/usage">Usage</a> | <a href="/about/faq">FAQ</a> | <a href="/about/stats">Stats</a> | Privacy</h2></center>
 
-    <p style="text-align: left;">
-        The public keyserver running on keys.openpgp.org processes, stores and
-        distributes OpenPGP key data. The specific way in which data is processed
-        differs by type as follows:
-        <ul>
-          <li><b>Email Addresses</b>
-              <p>Email addresses contained in <abbr title="Packet Tag 13">User
-                      IDs</abbr> are personally identifiable information (PII).
-                  Special care is taken to make sure they are used only with
-                  consent:
-                  <ul>
-                      <li>
-                          Publishing requires <a target="_blank"
-                              href="https://en.wikipedia.org/wiki/Opt-in_email#Confirmed_opt-in_(COI)_/_Double_opt-in_(DOI)">double
-                              opt-in</a> validation, to prove ownership of the
-                          email address in question.
-                      </li>
-                      <li>Addresses are searchable by exact email address,
-                          but not by associated name.</li>
-                      <li>Enumeration of addresses is not possible.</li>
-                      <li>Deletion of addresses is possible via simple proof
-                          of ownership in an automated fashion, similar to
-                          publication. To unlist an address where this isn't
-                          possible, write to support at keys dot openpgp dot
-                          org.
-                      </li>
-                  </ul>
-              </p>
-              <p>This data is never handed collectively ("as a dump") to third
-                  parties.
-              </p>
-          </li>
-          <li><b>Public Key Data</b>
-              <p>The cryptographic content of OpenPGP keys is not considered personally
-                  identifiable information. This includes specifically
-                  <abbr title="Packet Tags 6 and 14">public key material</abbr>,
-                  <abbr title="Packet Tag 2, Signature types 0x10-0x13, 0x18, 0x19, 0x1F">self-signatures</abbr>, and
-                  <abbr title="Packet Tag 2, Signature types 0x20, 0x28, 0x30">revocation signatures</abbr>.
-              </p>
-              <p>This data is not usually collectively available ("as
-                  a dump"), but may be handed upon request to third
-                  parties for purposes of development or research.
-              </p>
-          </li>
-          <li><b>Other User ID data</b>
-              <p>An OpenPGP key may contain personal data other than email
-                  addresses, such as <abbr title="Packet Tag 13">User IDs</abbr>
-                  that do not contain email addresses, or <abbr
-                  title="Packet Tag 17">image attributes</abbr>. This data is stripped
-              during upload and never stored, processed, or distributed in
-              any way.
-              </p>
-              <p>OpenPGP packet types that were not specifically mentioned above are
-                  stripped during upload and never stored, processed or
-                  distributed in any way.
-              </p>
-          </li>
-      </ul>
-      <p style="text-align: left">Data is never relayed to third parties outside of
-          what is available from the <a href="/about/api">public API interfaces</a>,
-          and what is described in this policy.
-      </p>
+    <h3>Name and contact details</h3>
+    <p>
+        <span class="brand">keys.openpgp.org</span> is a community effort.
+        You can find more information about us, and our contact, details <a href="https://keys.openpgp.org/about">here</a>.
+    </p>
+
+    <h3>How we process data</h3>
+    <p>
+        The public keyserver running on <span class="brand">keys.openpgp.org</span> processes, stores, and distributes OpenPGP certificate data.
+        The specific way in which data is processed differs by type as follows:
+    </p>
+
+    <ul>
+        <li>
+            <h4>Email Addresses</h4>
+
+            <p>
+                Email addresses of individuals contained in <abbr title="Packet Tag 13">User IDs</abbr> are personal data.
+                Special care is taken to make sure they are used only with consent, which you can withdraw at any time:
+            </p>
+
+            <ul>
+                <li>Publishing requires double opt-in validation, to prove ownership of the email address in question.</li>
+                <li>Addresses are searchable by exact email address, but not by associated name.</li>
+                <li>Enumeration of addresses is not possible.</li>
+                <li>Deletion of addresses is possible via simple proof of ownership in an automated fashion, similar to publication, using the <a href="https://keys.openpgp.org/manage">“manage“ tool</a>. To unlist an address where this isn't possible, write to support at keys dot openpgp dot org.</li>
+            </ul>
+
+            <p>
+                This data is never handed collectively (“as a dump“) to third parties.
+            </p>
+        </li>
+
+        <li>
+            <h4>Public Key Data</h4>
+
+            <p>
+                We process the cryptographic content of OpenPGP certificates - such as public key material, self-signatures, and revocation signatures – for the legitimate interest of providing the service.
+            </p>
+            <p>
+                This data is not usually collectively available (“as a dump“), but may be handed upon request to third parties for purposes of development or research.
+            </p>
+            <p>
+                If you upload your OpenPGP certificates to the service, you are the source of this data.
+                It is also possible for anyone who has your public OpenPGP certificate to upload them to this service – for example, if you have published them somewhere else, or sent them to someone. This does not include publication of Email Addresses, which are only used with explicit consent as described above.
+            </p>
+        </li>
+
+        <li>
+            <h4>Other User ID data</h4>
+
+            <p>
+                An OpenPGP certificate may contain personal data other than email addresses, such as User IDs that do not contain email addresses, or image attributes.
+                This data is stripped during upload and never stored, processed, or distributed in any way.
+            </p>
+            <p>
+                OpenPGP packet types that were not specifically mentioned above are stripped during upload and never stored, processed or distributed in any way.
+            </p>
+        </li>
+
+    </ul>
+
+    <p>
+        Data is never relayed to third parties outside of what is available from the public API interfaces, and what is described in this policy and on our <a href="https://keys.openpgp.org/about">about page</a>.
+    </p>
+    <p>
+        This service is available on the Internet, so anyone, anywhere in the world, can access it and retrieve data from it.
+    </p>
+
+    <h3>Retention periods</h3>
+
+    <p>
+        We will retain your email address linked with your OpenPGP certificates until you remove it.
+        We will remove your Public Key Data if you wish, but note that anyone can re-upload it to the service, in keeping with the “public” nature of this key material.
+    </p>
+
+    <p>
+        All incoming requests are logged for a period of 30 days, and only used as necessary for operation of the service.
+        IP addresses are anonymized for storage.
+    </p>
+
+    <h3>Your rights</h3>
+
+    <p>
+        You can withdraw consent to the processing of your email address at any time, or erase your email addresses, using the <a href="https://keys.openpgp.org/manage">“manage“ tool</a>.
+    </p>
+    <p>
+        You can obtain access to the personal data we process about you by viewing your OpenPGP certificates, or searching for your certificates using your email addresses, using this service.
+    </p>
+    <p>
+        You can delete your OpenPGP certificates by emailing support at keys dot openpgp dot org, but note that anyone can upload them again. If you object to having your certificate re-uploaded, email support at keys dot openpgp dot org and we will banlist your keys.
+    </p>
+    <p>
+        To exercise the right of portability, you can download your OpenPGP certificate using this service.
+    </p>
+    <p>
+        If you are in the EEA or UK, you also have the right to lodge a complaint with a supervisory authority, such as your local data protection authority.
+    </p>
 </div>