From bdb483a6d30a24bd28c2616f7ba3b572512c7ede Mon Sep 17 00:00:00 2001
From: Lisa Marie Maginnis <lisam@fsf.org>
Date: Mon, 30 Jun 2014 00:11:09 -0400
Subject: [PATCH] Fixed Zams at

---
 en/confirmation.html    | 2 +-
 en/index.html           | 2 +-
 en/infographic.html     | 2 +-
 en/mac.html             | 2 +-
 en/next_steps.html      | 2 +-
 en/windows.html         | 2 +-
 fr/confirmation.html    | 2 +-
 fr/index.html           | 2 +-
 fr/infographic.html     | 2 +-
 fr/mac.html             | 2 +-
 fr/next_steps.html      | 2 +-
 fr/windows.html         | 2 +-
 ja/index.html           | 2 +-
 ja/infographic.html     | 2 +-
 ja/mac.html             | 2 +-
 ja/next_steps.html      | 2 +-
 ja/windows.html         | 2 +-
 pt-br/confirmation.html | 2 +-
 pt-br/index.html        | 2 +-
 pt-br/infographic.html  | 2 +-
 pt-br/mac.html          | 2 +-
 pt-br/next_steps.html   | 2 +-
 pt-br/windows.html      | 2 +-
 ro/confirmation.html    | 2 +-
 ro/index.html           | 2 +-
 ro/infographic.html     | 2 +-
 ro/mac.html             | 2 +-
 ro/next_steps.html      | 2 +-
 ro/windows.html         | 2 +-
 ru/confirmation.html    | 2 +-
 ru/index.html           | 2 +-
 ru/infographic.html     | 2 +-
 ru/mac.html             | 2 +-
 ru/next_steps.html      | 2 +-
 ru/windows.html         | 2 +-
 tr/confirmation.html    | 2 +-
 tr/index.html           | 2 +-
 tr/infographic.html     | 2 +-
 tr/mac.html             | 2 +-
 tr/next_steps.html      | 2 +-
 tr/windows.html         | 2 +-
 41 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/en/confirmation.html b/en/confirmation.html
index 0ffc1648..8631c26f 100644
--- a/en/confirmation.html
+++ b/en/confirmation.html
@@ -40,7 +40,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. <a href="https://u.fsf.org/yr">Join.</a></p>
-                                        <p><em>Version 2.0. <!--Source code of Edward reply bot by Josh Drake <zamnedix@gnu.org> available under the GNU General Public License.--></em></p>
+                                        <p><em>Version 2.0. <!--Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.--></em></p>
 <p>The images on this page are under a <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (or later version)</a>, and the rest of it is under a <a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 license (or later version)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
 					<p>Download the source package for <a href="emailselfdefense_source.zip">this guide</a>. Fonts used in the guide &amp; infographic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347; <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> by Florian Cramer.</p>
                                         <p>
diff --git a/en/index.html b/en/index.html
index 3a8634e2..12c0c82e 100644
--- a/en/index.html
+++ b/en/index.html
@@ -486,7 +486,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. <a href="https://u.fsf.org/yr">Join.</a></p>
-                                        <p><em>Version 2.0. <!--Source code of Edward reply bot by Josh Drake <zamnedix@gnu.org> available under the GNU General Public License.--></em></p>
+                                        <p><em>Version 2.0. <!--Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.--></em></p>
 <p>The images on this page are under a <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (or later version)</a>, and the rest of it is under a <a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 license (or later version)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
 					<p>Download the source package for <a href="emailselfdefense_source.zip">this guide</a>. Fonts used in the guide &amp; infographic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> by Florian Cramer.</p>
                                         <p>
diff --git a/en/infographic.html b/en/infographic.html
index 3db2adb9..73f210fa 100644
--- a/en/infographic.html
+++ b/en/infographic.html
@@ -30,7 +30,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. <a href="https://u.fsf.org/yr">Join.</a></p>
-                                        <p><em>Version 2.0. <!--Source code of Edward reply bot by Josh Drake <zamnedix@gnu.org> available under the GNU General Public License.--></em></p>
+                                        <p><em>Version 2.0. <!--Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.--></em></p>
 <p>The images on this page are under a <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (or later version)</a>, and the rest of it is under a <a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 license (or later version)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
 					<p>Download the source packages for <a href="https://fixme.com">this guide</a> and for <a href="https://static.fsf.org/nosvn/enc-dev0/gnupg-infographic.zip">the infographic</a>. Fonts used in the guide &amp; infographic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347; <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> by Florian Cramer.</p>
                                         <p>
diff --git a/en/mac.html b/en/mac.html
index 72bc2adc..76df57a9 100644
--- a/en/mac.html
+++ b/en/mac.html
@@ -486,7 +486,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. <a href="https://u.fsf.org/yr">Join.</a></p>
-                                        <p><em>Version 2.0. <!--Source code of Edward reply bot by Josh Drake <zamnedix@gnu.org> available under the GNU General Public License.--></em></p>
+                                        <p><em>Version 2.0. <!--Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.--></em></p>
 <p>The images on this page are under a <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (or later version)</a>, and the rest of it is under a <a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 license (or later version)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
 					<p>Download the source package for <a href="emailselfdefense_source.zip">this guide</a>. Fonts used in the guide &amp; infographic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> by Florian Cramer.</p>
                                         <p>
diff --git a/en/next_steps.html b/en/next_steps.html
index 43a6a1e7..3d86c8a4 100644
--- a/en/next_steps.html
+++ b/en/next_steps.html
@@ -153,7 +153,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. <a href="https://u.fsf.org/yr">Join.</a></p>
-                                        <p><em>Version 2.0. <!--Source code of Edward reply bot by Josh Drake <zamnedix@gnu.org> available under the GNU General Public License.--></em></p>
+                                        <p><em>Version 2.0. <!--Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.--></em></p>
 <p>The images on this page are under a <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (or later version)</a>, and the rest of it is under a <a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 license (or later version)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
 					<p>Download the source package for <a href="emailselfdefense_source.zip">this guide</a>. Fonts used in the guide &amp; infographic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347; <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> by Florian Cramer.</p>
                                         <p>
diff --git a/en/windows.html b/en/windows.html
index 5f670695..49a1b704 100644
--- a/en/windows.html
+++ b/en/windows.html
@@ -484,7 +484,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. <a href="https://u.fsf.org/yr">Join.</a></p>
-                                        <p><em>Version 2.0. <!--Source code of Edward reply bot by Josh Drake <zamnedix@gnu.org> available under the GNU General Public License.--></em></p>
+                                        <p><em>Version 2.0. <!--Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.--></em></p>
 <p>The images on this page are under a <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (or later version)</a>, and the rest of it is under a <a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 license (or later version)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
 					<p>Download the source package for <a href="emailselfdefense_source.zip">this guide</a>. Fonts used in the guide &amp; infographic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> by Florian Cramer.</p>
                                         <p>
diff --git a/fr/confirmation.html b/fr/confirmation.html
index 385e37b1..9194fc15 100644
--- a/fr/confirmation.html
+++ b/fr/confirmation.html
@@ -57,7 +57,7 @@ href="https://my.fsf.org/donate/privacypolicy.html">Vie privée</a>. <a
 href="https://u.fsf.org/yr">Adhérer.</a></p>
 <p><em>Version 2.0. Traduction française par <a
 href="mailto:framalang@framalistes.org">&lt;framalang@framalistes.org&gt;</a>
-et <a href="mailto:trad-gnu@april.org">&lt;trad-gnu@april.org&gt;</a>.<a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Code source du robot Edward, par Josh Drake <zamnedix@gnu.org> disponible sous la licence publique générale GNU (GNU General Public License).</a></em></p>
+et <a href="mailto:trad-gnu@april.org">&lt;trad-gnu@april.org&gt;</a>.<a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Code source du robot Edward, par Josh Drake &lt;zamnedix@gnu.org&gt; disponible sous la licence publique générale GNU (GNU General Public License).</a></em></p>
 <p>Les illustrations de cette page sont sous licence <a
 href="https://creativecommons.org/licenses/by/4.0/deed.fr">Creative Commons
 attribution, 4.0 international (CC BY 4.0) ou version ultérieure</a>, et le
diff --git a/fr/index.html b/fr/index.html
index 122ea7d6..8bfc0bd2 100644
--- a/fr/index.html
+++ b/fr/index.html
@@ -859,7 +859,7 @@ href="https://my.fsf.org/donate/privacypolicy.html">Vie privée</a>. <a
 href="https://u.fsf.org/yr">Adhérer.</a></p>
 <p><em>Version 2.0. Traduction française par <a
 href="mailto:framalang@framalistes.org">&lt;framalang@framalistes.org&gt;</a>
-et <a href="mailto:trad-gnu@april.org">&lt;trad-gnu@april.org&gt;</a>.<a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Code source du robot Edward, par Josh Drake <zamnedix@gnu.org> disponible sous la licence publique générale GNU (GNU General Public License).</a></em></p>
+et <a href="mailto:trad-gnu@april.org">&lt;trad-gnu@april.org&gt;</a>.<a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Code source du robot Edward, par Josh Drake &lt;zamnedix@gnu.org&gt; disponible sous la licence publique générale GNU (GNU General Public License).</a></em></p>
 <p>Les illustrations de cette page sont sous licence <a
 href="https://creativecommons.org/licenses/by/4.0/deed.fr">Creative Commons
 attribution, 4.0 international (CC BY 4.0) ou version ultérieure</a>, et le
diff --git a/fr/infographic.html b/fr/infographic.html
index 197e6fe2..fc609c78 100644
--- a/fr/infographic.html
+++ b/fr/infographic.html
@@ -44,7 +44,7 @@ href="https://my.fsf.org/donate/privacypolicy.html">Vie privée</a>. <a
 href="https://u.fsf.org/yr">Adhérer.</a></p>
 <p><em>Version 2.0. Traduction française par <a
 href="mailto:framalang@framalistes.org">&lt;framalang@framalistes.org&gt;</a>
-et <a href="mailto:trad-gnu@april.org">&lt;trad-gnu@april.org&gt;</a>.<a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Code source du robot Edward, par Josh Drake <zamnedix@gnu.org> disponible sous la licence publique générale GNU (GNU General Public License).</a></em></p>
+et <a href="mailto:trad-gnu@april.org">&lt;trad-gnu@april.org&gt;</a>.<a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Code source du robot Edward, par Josh Drake &lt;zamnedix@gnu.org&gt; disponible sous la licence publique générale GNU (GNU General Public License).</a></em></p>
 <p>Les illustrations de cette page sont sous licence <a
 href="https://creativecommons.org/licenses/by/4.0/deed.fr">Creative Commons
 attribution, 4.0 international (CC BY 4.0) ou version ultérieure</a>, et le
diff --git a/fr/mac.html b/fr/mac.html
index 0de62c91..7e6d1fcb 100644
--- a/fr/mac.html
+++ b/fr/mac.html
@@ -884,7 +884,7 @@ href="https://my.fsf.org/donate/privacypolicy.html">Vie privée</a>. <a
 href="https://u.fsf.org/yr">Adhérer.</a></p>
 <p><em>Version 2.0. Traduction française par <a
 href="mailto:framalang@framalistes.org">&lt;framalang@framalistes.org&gt;</a>
-et <a href="mailto:trad-gnu@april.org">&lt;trad-gnu@april.org&gt;</a>.<a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Code source du robot Edward, par Josh Drake <zamnedix@gnu.org> disponible sous la licence publique générale GNU (GNU General Public License).</a></em></p>
+et <a href="mailto:trad-gnu@april.org">&lt;trad-gnu@april.org&gt;</a>.<a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Code source du robot Edward, par Josh Drake &lt;zamnedix@gnu.org&gt; disponible sous la licence publique générale GNU (GNU General Public License).</a></em></p>
 <p>Les illustrations de cette page sont sous licence <a
 href="https://creativecommons.org/licenses/by/4.0/deed.fr">Creative Commons
 attribution, 4.0 international (CC BY 4.0) ou version ultérieure</a>, et le
diff --git a/fr/next_steps.html b/fr/next_steps.html
index 23cd08fa..93e85a10 100644
--- a/fr/next_steps.html
+++ b/fr/next_steps.html
@@ -230,7 +230,7 @@ href="https://my.fsf.org/donate/privacypolicy.html">Vie privée</a>. <a
 href="https://u.fsf.org/yr">Adhérer.</a></p>
 <p><em>Version 2.0. Traduction française par <a
 href="mailto:framalang@framalistes.org">&lt;framalang@framalistes.org&gt;</a>
-et <a href="mailto:trad-gnu@april.org">&lt;trad-gnu@april.org&gt;</a>.<a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Code source du robot Edward, par Josh Drake <zamnedix@gnu.org> disponible sous la licence publique générale GNU (GNU General Public License).</a></em></p>
+et <a href="mailto:trad-gnu@april.org">&lt;trad-gnu@april.org&gt;</a>.<a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Code source du robot Edward, par Josh Drake &lt;zamnedix@gnu.org&gt; disponible sous la licence publique générale GNU (GNU General Public License).</a></em></p>
 <p>Les illustrations de cette page sont sous licence <a
 href="https://creativecommons.org/licenses/by/4.0/deed.fr">Creative Commons
 attribution, 4.0 international (CC BY 4.0) ou version ultérieure</a>, et le
diff --git a/fr/windows.html b/fr/windows.html
index 8894eacd..28fb24a0 100644
--- a/fr/windows.html
+++ b/fr/windows.html
@@ -883,7 +883,7 @@ href="https://my.fsf.org/donate/privacypolicy.html">Vie privée</a>. <a
 href="https://u.fsf.org/yr">Adhérer.</a></p>
 <p><em>Version 2.0. Traduction française par <a
 href="mailto:framalang@framalistes.org">&lt;framalang@framalistes.org&gt;</a>
-et <a href="mailto:trad-gnu@april.org">&lt;trad-gnu@april.org&gt;</a>.<a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Code source du robot Edward, par Josh Drake <zamnedix@gnu.org> disponible sous la licence publique générale GNU (GNU General Public License).</a></em></p>
+et <a href="mailto:trad-gnu@april.org">&lt;trad-gnu@april.org&gt;</a>.<a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Code source du robot Edward, par Josh Drake &lt;zamnedix@gnu.org&gt; disponible sous la licence publique générale GNU (GNU General Public License).</a></em></p>
 <p>Les illustrations de cette page sont sous licence <a
 href="https://creativecommons.org/licenses/by/4.0/deed.fr">Creative Commons
 attribution, 4.0 international (CC BY 4.0) ou version ultérieure</a>, et le
diff --git a/ja/index.html b/ja/index.html
index ea71e71a..b7b90cbc 100644
--- a/ja/index.html
+++ b/ja/index.html
@@ -485,7 +485,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. <a href="https://u.fsf.org/yr">Join.</a></p>
-                                        <p><em>Version 2.0. <!--LANGUAGE translation by NAME, NAME and NAME.--> <!--Source code of Edward reply bot by Josh Drake <zamnedix@gnu.org> available under the GNU General Public License.--></em></p>
+                                        <p><em>Version 2.0. <!--LANGUAGE translation by NAME, NAME and NAME.--> <!--Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.--></em></p>
 <p>このページの画像に<a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (or later version)</a>が使われ、他のものには<a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 license (or later version)</a>が使用されています。&mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">どうしてこのライセンスを？</a></p>
 					<p><a href="emailselfdefense_source.zip">このガイドの</a>ソースをダウンロード。 このガイドとインフォグラフィックに使われているフォント：<a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> by Florian Cramer.</p>
                                         <p>
diff --git a/ja/infographic.html b/ja/infographic.html
index d5f2a866..bf9220ac 100644
--- a/ja/infographic.html
+++ b/ja/infographic.html
@@ -32,7 +32,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. <a href="https://u.fsf.org/yr">Join.</a></p>
-                                        <p><em>Version 2.0. <!--LANGUAGE translation by NAME, NAME and NAME.--> <!--Source code of Edward reply bot by Josh Drake <zamnedix@gnu.org> available under the GNU General Public License.--></em></p>
+                                        <p><em>Version 2.0. <!--LANGUAGE translation by NAME, NAME and NAME.--> <!--Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.--></em></p>
 <p>このページの画像に<a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (or later version)</a>が使われ、他のものには<a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 license (or later version)</a>が使用されています。&mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">どうしてこのライセンスを？</a></p>
 					<p><a href="emailselfdefense_source.zip">このガイドの</a>ソースをダウンロード。 このガイドとインフォグラフィックに使われているフォント：<a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> by Florian Cramer.</p>
                                         <p>
diff --git a/ja/mac.html b/ja/mac.html
index 7a84337b..16f2e154 100644
--- a/ja/mac.html
+++ b/ja/mac.html
@@ -501,7 +501,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. <a href="https://u.fsf.org/yr">Join.</a></p>
-                                        <p><em>Version 2.0. <!--LANGUAGE translation by NAME, NAME and NAME.--> <!--Source code of Edward reply bot by Josh Drake <zamnedix@gnu.org> available under the GNU General Public License.--></em></p>
+                                        <p><em>Version 2.0. <!--LANGUAGE translation by NAME, NAME and NAME.--> <!--Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.--></em></p>
 <p>このページの画像に<a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (or later version)</a>が使われ、他のものには<a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 license (or later version)</a>が使用されています。&mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">どうしてこのライセンスを？</a></p>
 					<p><a href="emailselfdefense_source.zip">このガイドの</a>ソースをダウンロード。 このガイドとインフォグラフィックに使われているフォント：<a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> by Florian Cramer.</p>
                                         <p>
diff --git a/ja/next_steps.html b/ja/next_steps.html
index 0a53b4cc..f636a156 100644
--- a/ja/next_steps.html
+++ b/ja/next_steps.html
@@ -148,7 +148,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. <a href="https://u.fsf.org/yr">Join.</a></p>
-                                        <p><em>Version 2.0. <!--LANGUAGE translation by NAME, NAME and NAME.--> <!--Source code of Edward reply bot by Josh Drake <zamnedix@gnu.org> available under the GNU General Public License.--></em></p>
+                                        <p><em>Version 2.0. <!--LANGUAGE translation by NAME, NAME and NAME.--> <!--Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.--></em></p>
 <p>このページの画像に<a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (or later version)</a>が使われ、他のものには<a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 license (or later version)</a>が使用されています。&mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">どうしてこのライセンスを？</a></p>
 					<p><a href="emailselfdefense_source.zip">このガイドの</a>ソースをダウンロード。 このガイドとインフォグラフィックに使われているフォント：<a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> by Florian Cramer.</p>
                                         <p>
diff --git a/ja/windows.html b/ja/windows.html
index 92b82435..a90c702b 100644
--- a/ja/windows.html
+++ b/ja/windows.html
@@ -504,7 +504,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. <a href="https://u.fsf.org/yr">Join.</a></p>
-                                        <p><em>Version 2.0. <!--LANGUAGE translation by NAME, NAME and NAME.--> <!--Source code of Edward reply bot by Josh Drake <zamnedix@gnu.org> available under the GNU General Public License.--></em></p>
+                                        <p><em>Version 2.0. <!--LANGUAGE translation by NAME, NAME and NAME.--> <!--Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.--></em></p>
 <p>このページの画像に<a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (or later version)</a>が使われ、他のものには<a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 license (or later version)</a>が使用されています。&mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">どうしてこのライセンスを？</a></p>
 					<p><a href="emailselfdefense_source.zip">このガイドの</a>ソースをダウンロード。 このガイドとインフォグラフィックに使われているフォント：<a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> by Florian Cramer.</p>
                                         <p>
diff --git a/pt-br/confirmation.html b/pt-br/confirmation.html
index e7ca21bc..3905ee88 100644
--- a/pt-br/confirmation.html
+++ b/pt-br/confirmation.html
@@ -40,7 +40,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Política de Privacidade</a>. <a href="https://u.fsf.org/yr">Junte-se a nós.</a></p>
-					<p><em>Versão 2.0. Tradução pra português do Brasil por <a href="http://cmirio.tk">CMI-Rio</a> e <a href="mailto:thiago@marinello.eng.br">Thiago Marinello</a></em></p><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Código-fonte do robô de e-mail Edward por Josh Drake <zamnedix@gnu.org> disponível sob a GNU General Public License.</a>
+					<p><em>Versão 2.0. Tradução pra português do Brasil por <a href="http://cmirio.tk">CMI-Rio</a> e <a href="mailto:thiago@marinello.eng.br">Thiago Marinello</a></em></p><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Código-fonte do robô de e-mail Edward por Josh Drake &lt;zamnedix@gnu.org&gt; disponível sob a GNU General Public License.</a>
 <p>As imagens dessa página estão sob a licença de uso <a href="https://creativecommons.org/licenses/by/4.0/deed.pt_BR">Creative Commons Atribuição 4.0 Internacional (ou uma versão mais nova)</a>, e o resto está sob <a href="https://creativecommons.org/licenses/by-sa/4.0/deed.pt_BR">Creative Commons Atribuição-CompartilhaIgual 4.0 Internacional (ou uma versão mais nova)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.pt-br.html#OtherLicenses">Por quê essas licenças?</a></p>
 					<p>Faça download do <a href=emailselfdefense_source.zip>código-fonte para esse guia</a>. As fontes usadas no guia &amp; infográfico: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> por Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> por Anna Giedry&#347; <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> por Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> por Florian Cramer.</p>
                                         <p>
diff --git a/pt-br/index.html b/pt-br/index.html
index 7fbc5247..5115d3d1 100644
--- a/pt-br/index.html
+++ b/pt-br/index.html
@@ -489,7 +489,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Política de Privacidade</a>. <a href="https://u.fsf.org/yr">Junte-se a nós.</a></p>
-					<p><em>Versão 2.0. Tradução pra português do Brasil por <a href="http://cmirio.tk">CMI-Rio</a> e <a href="mailto:thiago@marinello.eng.br">Thiago Marinello</a></em></p><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Código-fonte do robô de e-mail Edward por Josh Drake <zamnedix@gnu.org> disponível sob a GNU General Public License.</a>
+					<p><em>Versão 2.0. Tradução pra português do Brasil por <a href="http://cmirio.tk">CMI-Rio</a> e <a href="mailto:thiago@marinello.eng.br">Thiago Marinello</a></em></p><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Código-fonte do robô de e-mail Edward por Josh Drake &lt;zamnedix@gnu.org&gt; disponível sob a GNU General Public License.</a>
 <p>As imagens dessa página estão sob a licença de uso <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 (ou uma versão mais nova)</a>, e o resto está sob <a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 (ou uma versão mais nova)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.pt-br.html#OtherLicenses">Por quê essas licenças?</a></p>
 					<p>Faça download do <a href=emailselfdefense_source.zip>código-fonte para esse guia</a>. As fontes usadas no guia &amp; infográfico: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> por Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> por Anna Giedry&#347; <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> por Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> por Florian Cramer.</p>
                                         <p>
diff --git a/pt-br/infographic.html b/pt-br/infographic.html
index 01f81500..9de5520b 100644
--- a/pt-br/infographic.html
+++ b/pt-br/infographic.html
@@ -31,7 +31,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Política de Privacidade</a>. <a href="https://u.fsf.org/yr">Junte-se a nós.</a></p>
-					<p><em>Versão 2.0. Tradução pra português do Brasil por <a href="http://cmirio.tk">CMI-Rio</a> e <a href="mailto:thiago@marinello.eng.br">Thiago Marinello</a></em></p><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Código-fonte do robô de e-mail Edward por Josh Drake <zamnedix@gnu.org> disponível sob a GNU General Public License.</a>
+					<p><em>Versão 2.0. Tradução pra português do Brasil por <a href="http://cmirio.tk">CMI-Rio</a> e <a href="mailto:thiago@marinello.eng.br">Thiago Marinello</a></em></p><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Código-fonte do robô de e-mail Edward por Josh Drake &lt;zamnedix@gnu.org&gt; disponível sob a GNU General Public License.</a>
 <p>As imagens dessa página estão sob a licença de uso <a href="https://creativecommons.org/licenses/by/4.0/deed.pt_BR">Creative Commons Atribuição 4.0 Internacional (ou uma versão mais nova)</a>, e o resto está sob <a href="https://creativecommons.org/licenses/by-sa/4.0/deed.pt_BR">Creative Commons Atribuição-CompartilhaIgual 4.0 Internacional (ou uma versão mais nova)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.pt-br.html#OtherLicenses">Por quê essas licenças?</a></p>
 					<p>Faça download do <a href=emailselfdefense_source.zip>código-fonte para esse guia</a>. As fontes usadas no guia &amp; infográfico: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> por Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> por Anna Giedry&#347; <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> por Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> por Florian Cramer.</p>
                                         <p>
diff --git a/pt-br/mac.html b/pt-br/mac.html
index abb89d1e..7b131a54 100644
--- a/pt-br/mac.html
+++ b/pt-br/mac.html
@@ -510,7 +510,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Política de Privacidade</a>. <a href="https://u.fsf.org/yr">Junte-se a nós.</a></p>
-					<p><em>Versão 2.0. Tradução pra português do Brasil por <a href="http://cmirio.tk">CMI-Rio</a> e <a href="mailto:thiago@marinello.eng.br">Thiago Marinello</a></em></p><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Código-fonte do robô de e-mail Edward por Josh Drake <zamnedix@gnu.org> disponível sob a GNU General Public License.</a>
+					<p><em>Versão 2.0. Tradução pra português do Brasil por <a href="http://cmirio.tk">CMI-Rio</a> e <a href="mailto:thiago@marinello.eng.br">Thiago Marinello</a></em></p><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Código-fonte do robô de e-mail Edward por Josh Drake &lt;zamnedix@gnu.org&gt; disponível sob a GNU General Public License.</a>
 <p>As imagens dessa página estão sob a licença de uso <a href="https://creativecommons.org/licenses/by/4.0/deed.pt_BR">Creative Commons Atribuição 4.0 Internacional (ou uma versão mais nova)</a>, e o resto está sob <a href="https://creativecommons.org/licenses/by-sa/4.0/deed.pt_BR">Creative Commons Atribuição-CompartilhaIgual 4.0 Internacional (ou uma versão mais nova)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.pt-br.html#OtherLicenses">Por quê essas licenças?</a></p>
 					<p>Faça download do <a href=emailselfdefense_source.zip>código-fonte para esse guia</a>. As fontes usadas no guia &amp; infográfico: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> por Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> por Anna Giedry&#347; <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> por Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> por Florian Cramer.</p>
                                         <p>
diff --git a/pt-br/next_steps.html b/pt-br/next_steps.html
index 0060cbe3..67859a4f 100644
--- a/pt-br/next_steps.html
+++ b/pt-br/next_steps.html
@@ -149,7 +149,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Política de Privacidade</a>. <a href="https://u.fsf.org/yr">Junte-se a nós.</a></p>
-					<p><em>Versão 2.0. Tradução pra português do Brasil por <a href="http://cmirio.tk">CMI-Rio</a> e <a href="mailto:thiago@marinello.eng.br">Thiago Marinello</a></em></p><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Código-fonte do robô de e-mail Edward por Josh Drake <zamnedix@gnu.org> disponível sob a GNU General Public License.</a>
+					<p><em>Versão 2.0. Tradução pra português do Brasil por <a href="http://cmirio.tk">CMI-Rio</a> e <a href="mailto:thiago@marinello.eng.br">Thiago Marinello</a></em></p><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Código-fonte do robô de e-mail Edward por Josh Drake &lt;zamnedix@gnu.org&gt; disponível sob a GNU General Public License.</a>
 <p>As imagens dessa página estão sob a licença de uso <a href="https://creativecommons.org/licenses/by/4.0/deed.pt_BR">Creative Commons Atribuição 4.0 Internacional (ou uma versão mais nova)</a>, e o resto está sob <a href="https://creativecommons.org/licenses/by-sa/4.0/deed.pt_BR">Creative Commons Atribuição-CompartilhaIgual 4.0 Internacional (ou uma versão mais nova)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.pt-br.html#OtherLicenses">Por quê essas licenças?</a></p>
 					<p>Faça download do <a href=emailselfdefense_source.zip>código-fonte para esse guia</a>. As fontes usadas no guia &amp; infográfico: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> por Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> por Anna Giedry&#347; <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> por Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> por Florian Cramer.</p>
                                         <p>
diff --git a/pt-br/windows.html b/pt-br/windows.html
index 62c2cb09..c63d6670 100644
--- a/pt-br/windows.html
+++ b/pt-br/windows.html
@@ -504,7 +504,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Política de Privacidade</a>. <a href="https://u.fsf.org/yr">Junte-se a nós.</a></p>
-					<p><em>Versão 2.0. Tradução pra português do Brasil por <a href="http://cmirio.tk">CMI-Rio</a> e <a href="mailto:thiago@marinello.eng.br">Thiago Marinello</a></em></p><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Código-fonte do robô de e-mail Edward por Josh Drake <zamnedix@gnu.org> disponível sob a GNU General Public License.</a>
+					<p><em>Versão 2.0. Tradução pra português do Brasil por <a href="http://cmirio.tk">CMI-Rio</a> e <a href="mailto:thiago@marinello.eng.br">Thiago Marinello</a></em></p><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Código-fonte do robô de e-mail Edward por Josh Drake &lt;zamnedix@gnu.org&gt; disponível sob a GNU General Public License.</a>
 <p>As imagens dessa página estão sob a licença de uso <a href="https://creativecommons.org/licenses/by/4.0/deed.pt_BR">Creative Commons Atribuição 4.0 Internacional (ou uma versão mais nova)</a>, e o resto está sob <a href="https://creativecommons.org/licenses/by-sa/4.0/deed.pt_BR">Creative Commons Atribuição-CompartilhaIgual 4.0 Internacional (ou uma versão mais nova)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.pt-br.html#OtherLicenses">Por quê essas licenças?</a></p>
 					<p>Faça download do <a href=emailselfdefense_source.zip>código-fonte para esse guia</a>. As fontes usadas no guia &amp; infográfico: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> por Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> por Anna Giedry&#347; <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> por Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> por Florian Cramer.</p>
                                         <p>
diff --git a/ro/confirmation.html b/ro/confirmation.html
index 6718b4bf..3c5c2341 100644
--- a/ro/confirmation.html
+++ b/ro/confirmation.html
@@ -41,7 +41,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Fundația pentru Software Liber" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Fundația pentru Software Liber</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Politica de confidențialitate</a>. <a href="https://u.fsf.org/yr">Înscrieți-vă.</a></p>
-                                        <p><em>Versiunea 2.0. <!--Romanian translation by Cătălin Frâncu.--> <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Codul-sursă al robotului de răspunsuri Edward de Josh Drake <zamnedix@gnu.org> disponibil sub Licența Publică Generală GNU.</a></em></p>
+                                        <p><em>Versiunea 2.0. <!--Romanian translation by Cătălin Frâncu.--> <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Codul-sursă al robotului de răspunsuri Edward de Josh Drake &lt;zamnedix@gnu.org&gt; disponibil sub Licența Publică Generală GNU.</a></em></p>
 <p>Imaginile de pe această pagină sunt sub <a href="https://creativecommons.org/licenses/by/4.0/">licența Creative Commons Attribution 4.0 (sau o versiune ulterioară)</a>, iar restul ei este sub <a href="https://creativecommons.org/licenses/by-sa/4.0">licența Creative Commons Attribution-ShareAlike 4.0 (sau o versiune ulterioară)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">De ce aceste licențe?</a></p>
 					<p>Descărcați pachetul-sursă pentru <a href="emailselfdefense_source.zip">acest ghid</a>. Fonturi folosite în ghid și în infografic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> de Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> de Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> de Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> de Florian Cramer, <a href="https://fedorahosted.org/liberation-fonts/">Liberation Sans</a> de Red Hat, <a href="http://font.ubuntu.com/">Ubuntu</a> de Dalton Maag, <a href="http://dejavu-fonts.org/">DejaVu</a> de <a href="http://dejavu-fonts.org/wiki/Authors">autori multipli</a>.
                                         <p>
diff --git a/ro/index.html b/ro/index.html
index cfb0d571..406a31c9 100644
--- a/ro/index.html
+++ b/ro/index.html
@@ -487,7 +487,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Fundația pentru Software Liber" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Fundația pentru Software Liber</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Politica de confidențialitate</a>. <a href="https://u.fsf.org/yr">Înscrieți-vă.</a></p>
-                                        <p><em>Versiunea 2.0. <!--Romanian translation by Cătălin Frâncu.--> <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Codul-sursă al robotului de răspunsuri Edward de Josh Drake <zamnedix@gnu.org> disponibil sub Licența Publică Generală GNU.</a></em></p>
+                                        <p><em>Versiunea 2.0. <!--Romanian translation by Cătălin Frâncu.--> <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Codul-sursă al robotului de răspunsuri Edward de Josh Drake &lt;zamnedix@gnu.org&gt; disponibil sub Licența Publică Generală GNU.</a></em></p>
 <p>Imaginile de pe această pagină sunt sub <a href="https://creativecommons.org/licenses/by/4.0/">licența Creative Commons Attribution 4.0 (sau o versiune ulterioară)</a>, iar restul ei este sub <a href="https://creativecommons.org/licenses/by-sa/4.0">licența Creative Commons Attribution-ShareAlike 4.0 (sau o versiune ulterioară)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">De ce aceste licențe?</a></p>
 					<p>Descărcați pachetul-sursă pentru <a href="emailselfdefense_source.zip">acest ghid</a>. Fonturi folosite în ghid și în infografic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> de Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> de Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> de Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> de Florian Cramer, <a href="https://fedorahosted.org/liberation-fonts/">Liberation Sans</a> de Red Hat, <a href="http://font.ubuntu.com/">Ubuntu</a> de Dalton Maag, <a href="http://dejavu-fonts.org/">DejaVu</a> de <a href="http://dejavu-fonts.org/wiki/Authors">autori multipli</a>.
                                         <p>
diff --git a/ro/infographic.html b/ro/infographic.html
index abc474ae..5920529f 100644
--- a/ro/infographic.html
+++ b/ro/infographic.html
@@ -31,7 +31,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Fundația pentru Software Liber" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Fundația pentru Software Liber</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Politica de confidențialitate</a>. <a href="https://u.fsf.org/yr">Înscrieți-vă.</a></p>
-                                        <p><em>Versiunea 2.0. <!--Romanian translation by Cătălin Frâncu.--> <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Codul-sursă al robotului de răspunsuri Edward de Josh Drake <zamnedix@gnu.org> disponibil sub Licența Publică Generală GNU.</a></em></p>
+                                        <p><em>Versiunea 2.0. <!--Romanian translation by Cătălin Frâncu.--> <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Codul-sursă al robotului de răspunsuri Edward de Josh Drake &lt;zamnedix@gnu.org&gt; disponibil sub Licența Publică Generală GNU.</a></em></p>
 <p>Imaginile de pe această pagină sunt sub <a href="https://creativecommons.org/licenses/by/4.0/">licența Creative Commons Attribution 4.0 (sau o versiune ulterioară)</a>, iar restul ei este sub <a href="https://creativecommons.org/licenses/by-sa/4.0">licența Creative Commons Attribution-ShareAlike 4.0 (sau o versiune ulterioară)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">De ce aceste licențe?</a></p>
 					<p>Descărcați pachetul-sursă pentru <a href="emailselfdefense_source.zip">acest ghid</a>. Fonturi folosite în ghid și în infografic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> de Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> de Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> de Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> de Florian Cramer, <a href="https://fedorahosted.org/liberation-fonts/">Liberation Sans</a> de Red Hat, <a href="http://font.ubuntu.com/">Ubuntu</a> de Dalton Maag, <a href="http://dejavu-fonts.org/">DejaVu</a> de <a href="http://dejavu-fonts.org/wiki/Authors">autori multipli</a>.
                                         <p>
diff --git a/ro/mac.html b/ro/mac.html
index add76218..f4c2f606 100644
--- a/ro/mac.html
+++ b/ro/mac.html
@@ -482,7 +482,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Fundația pentru Software Liber" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Fundația pentru Software Liber</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Politica de confidențialitate</a>. <a href="https://u.fsf.org/yr">Înscrieți-vă.</a></p>
-                                        <p><em>Versiunea 2.0. <!--Romanian translation by Cătălin Frâncu.--> <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Codul-sursă al robotului de răspunsuri Edward de Josh Drake <zamnedix@gnu.org> disponibil sub Licența Publică Generală GNU.</a></em></p>
+                                        <p><em>Versiunea 2.0. <!--Romanian translation by Cătălin Frâncu.--> <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Codul-sursă al robotului de răspunsuri Edward de Josh Drake &lt;zamnedix@gnu.org&gt; disponibil sub Licența Publică Generală GNU.</a></em></p>
 <p>Imaginile de pe această pagină sunt sub <a href="https://creativecommons.org/licenses/by/4.0/">licența Creative Commons Attribution 4.0 (sau o versiune ulterioară)</a>, iar restul ei este sub <a href="https://creativecommons.org/licenses/by-sa/4.0">licența Creative Commons Attribution-ShareAlike 4.0 (sau o versiune ulterioară)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">De ce aceste licențe?</a></p>
 					<p>Descărcați pachetul-sursă pentru <a href="emailselfdefense_source.zip">acest ghid</a>. Fonturi folosite în ghid și în infografic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> de Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> de Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> de Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> de Florian Cramer, <a href="https://fedorahosted.org/liberation-fonts/">Liberation Sans</a> de Red Hat, <a href="http://font.ubuntu.com/">Ubuntu</a> de Dalton Maag, <a href="http://dejavu-fonts.org/">DejaVu</a> de <a href="http://dejavu-fonts.org/wiki/Authors">autori multipli</a>.
                                         <p>
diff --git a/ro/next_steps.html b/ro/next_steps.html
index 3baf9d23..28cd4968 100644
--- a/ro/next_steps.html
+++ b/ro/next_steps.html
@@ -154,7 +154,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Fundația pentru Software Liber" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Fundația pentru Software Liber</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Politica de confidențialitate</a>. <a href="https://u.fsf.org/yr">Înscrieți-vă.</a></p>
-                                        <p><em>Versiunea 2.0. <!--Romanian translation by Cătălin Frâncu.--> <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Codul-sursă al robotului de răspunsuri Edward de Josh Drake <zamnedix@gnu.org> disponibil sub Licența Publică Generală GNU.</a></em></p>
+                                        <p><em>Versiunea 2.0. <!--Romanian translation by Cătălin Frâncu.--> <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Codul-sursă al robotului de răspunsuri Edward de Josh Drake &lt;zamnedix@gnu.org&gt; disponibil sub Licența Publică Generală GNU.</a></em></p>
 <p>Imaginile de pe această pagină sunt sub <a href="https://creativecommons.org/licenses/by/4.0/">licența Creative Commons Attribution 4.0 (sau o versiune ulterioară)</a>, iar restul ei este sub <a href="https://creativecommons.org/licenses/by-sa/4.0">licența Creative Commons Attribution-ShareAlike 4.0 (sau o versiune ulterioară)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">De ce aceste licențe?</a></p>
 					<p>Descărcați pachetul-sursă pentru <a href="emailselfdefense_source.zip">acest ghid</a>. Fonturi folosite în ghid și în infografic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> de Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> de Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> de Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> de Florian Cramer, <a href="https://fedorahosted.org/liberation-fonts/">Liberation Sans</a> de Red Hat, <a href="http://font.ubuntu.com/">Ubuntu</a> de Dalton Maag, <a href="http://dejavu-fonts.org/">DejaVu</a> de <a href="http://dejavu-fonts.org/wiki/Authors">autori multipli</a>.
                                         <p>
diff --git a/ro/windows.html b/ro/windows.html
index 7e22ba42..a2d312c8 100644
--- a/ro/windows.html
+++ b/ro/windows.html
@@ -482,7 +482,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Fundația pentru Software Liber" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Fundația pentru Software Liber</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Politica de confidențialitate</a>. <a href="https://u.fsf.org/yr">Înscrieți-vă.</a></p>
-                                        <p><em>Versiunea 2.0. <!--Romanian translation by Cătălin Frâncu.--> <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Codul-sursă al robotului de răspunsuri Edward de Josh Drake <zamnedix@gnu.org> disponibil sub Licența Publică Generală GNU.</a></em></p>
+                                        <p><em>Versiunea 2.0. <!--Romanian translation by Cătălin Frâncu.--> <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Codul-sursă al robotului de răspunsuri Edward de Josh Drake &lt;zamnedix@gnu.org&gt; disponibil sub Licența Publică Generală GNU.</a></em></p>
 <p>Imaginile de pe această pagină sunt sub <a href="https://creativecommons.org/licenses/by/4.0/">licența Creative Commons Attribution 4.0 (sau o versiune ulterioară)</a>, iar restul ei este sub <a href="https://creativecommons.org/licenses/by-sa/4.0">licența Creative Commons Attribution-ShareAlike 4.0 (sau o versiune ulterioară)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">De ce aceste licențe?</a></p>
 					<p>Descărcați pachetul-sursă pentru <a href="emailselfdefense_source.zip">acest ghid</a>. Fonturi folosite în ghid și în infografic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> de Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> de Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> de Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> de Florian Cramer, <a href="https://fedorahosted.org/liberation-fonts/">Liberation Sans</a> de Red Hat, <a href="http://font.ubuntu.com/">Ubuntu</a> de Dalton Maag, <a href="http://dejavu-fonts.org/">DejaVu</a> de <a href="http://dejavu-fonts.org/wiki/Authors">autori multipli</a>.
                                         <p>
diff --git a/ru/confirmation.html b/ru/confirmation.html
index 332ca8b2..756053c2 100644
--- a/ru/confirmation.html
+++ b/ru/confirmation.html
@@ -40,7 +40,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/ru/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Политика конфиденциальности</a>. <a href="https://u.fsf.org/yr">Присоединяйтесь.</a></p>
-                                        <p><em>Версия 2.0. <!--LANGUAGE translation by NAME, NAME and NAME.--></em></p><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Исходный код бота-автоответчика Эдварда разработан Josh Drake <zamnedix@gnu.org> и доступен в рамках стандартной общественной лицензии GNU.</a>
+                                        <p><em>Версия 2.0. <!--LANGUAGE translation by NAME, NAME and NAME.--></em></p><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Исходный код бота-автоответчика Эдварда разработан Josh Drake &lt;zamnedix@gnu.org&gt; и доступен в рамках стандартной общественной лицензии GNU.</a>
 <p>Изображения, представленные на данной странице, лицензированы в соответствии с <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (или более поздней версии)</a>, все остальное лицензировано в соответствии с <a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 license (или более поздней версии)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Почему эти лицензии?</a></p>
 					<p>Скачайте пакеты с исходным кодом для <a href="gnupg-guide.zip">данного руководства</a> и для <a href="gnupg-infographic.zip">инфографики</a>. Шрифты, использованные в данном руководстве &amp; инфографика: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> от Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> от Anna Giedry&#347; <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> от Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> от Florian Cramer.</p>
                                         <p>
diff --git a/ru/index.html b/ru/index.html
index 47c97a1b..43384b48 100644
--- a/ru/index.html
+++ b/ru/index.html
@@ -486,7 +486,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Политика конфиденциальности</a>. <a href="https://u.fsf.org/yr">Присоединяйтесь.</a></p>
-                                        <p><em>Версия 2.0. <!--LANGUAGE translation by NAME, NAME and NAME.--></em></p><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Исходный код бота-автоответчика Эдварда разработан Josh Drake <zamnedix@gnu.org> и доступен в рамках стандартной общественной лицензии GNU.</a>
+                                        <p><em>Версия 2.0. <!--LANGUAGE translation by NAME, NAME and NAME.--></em></p><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Исходный код бота-автоответчика Эдварда разработан Josh Drake &lt;zamnedix@gnu.org&gt; и доступен в рамках стандартной общественной лицензии GNU.</a>
 <p>Изображения, представленные на данной странице, лицензированы в соответствии с <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (или более поздней версии)</a>, все остальное лицензировано в соответствии с <a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 license (или более поздней версии)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Почему эти лицензии?</a></p>
 					<p>Скачайте пакеты с исходным кодом для <a href="gnupg-guide.zip">данного руководства</a> и для <a href="gnupg-infographic.zip">инфографики</a>. Шрифты, использованные в данном руководстве &amp; инфографика: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> от Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> от Anna Giedry&#347; <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> от Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> от Florian Cramer.</p>
                                         <p>
diff --git a/ru/infographic.html b/ru/infographic.html
index 10359382..b8fef112 100644
--- a/ru/infographic.html
+++ b/ru/infographic.html
@@ -31,7 +31,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/ru/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Политика конфиденциальности</a>. <a href="https://u.fsf.org/yr">Присоединяйтесь.</a></p>
-                                        <p><em>Версия 2.0. <!--LANGUAGE translation by NAME, NAME and NAME.--></em></p><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Исходный код бота-автоответчика Эдварда разработан Josh Drake <zamnedix@gnu.org> и доступен в рамках стандартной общественной лицензии GNU.</a>
+                                        <p><em>Версия 2.0. <!--LANGUAGE translation by NAME, NAME and NAME.--></em></p><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Исходный код бота-автоответчика Эдварда разработан Josh Drake &lt;zamnedix@gnu.org&gt; и доступен в рамках стандартной общественной лицензии GNU.</a>
 <p>Изображения, представленные на данной странице, лицензированы в соответствии с <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (или более поздней версии)</a>, все остальное лицензировано в соответствии с <a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 license (или более поздней версии)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Почему эти лицензии?</a></p>
 					<p>Скачайте пакеты с исходным кодом для <a href="gnupg-guide.zip">данного руководства</a> и для <a href="gnupg-infographic.zip">инфографики</a>. Шрифты, использованные в данном руководстве &amp; инфографика: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> от Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> от Anna Giedry&#347; <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> от Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> от Florian Cramer.</p>
                                         <p>
diff --git a/ru/mac.html b/ru/mac.html
index 00aa9df1..69a5c65a 100644
--- a/ru/mac.html
+++ b/ru/mac.html
@@ -495,7 +495,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Политика конфиденциальности</a>. <a href="https://u.fsf.org/yr">Присоединяйтесь.</a></p>
-                                        <p><em>Версия 2.0. <!--LANGUAGE translation by NAME, NAME and NAME.--></em></p><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Исходный код бота-автоответчика Эдварда разработан Josh Drake <zamnedix@gnu.org> и доступен в рамках стандартной общественной лицензии GNU.</a>
+                                        <p><em>Версия 2.0. <!--LANGUAGE translation by NAME, NAME and NAME.--></em></p><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Исходный код бота-автоответчика Эдварда разработан Josh Drake &lt;zamnedix@gnu.org&gt; и доступен в рамках стандартной общественной лицензии GNU.</a>
 <p>Изображения, представленные на данной странице, лицензированы в соответствии с <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (или более поздней версии)</a>, все остальное лицензировано в соответствии с <a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 license (или более поздней версии)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Почему эти лицензии?</a></p>
 					<p>Скачайте пакеты с исходным кодом для <a href="gnupg-guide.zip">данного руководства</a> и для <a href="gnupg-infographic.zip">инфографики</a>. Шрифты, использованные в данном руководстве &amp; инфографика: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> от Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> от Anna Giedry&#347; <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> от Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> от Florian Cramer.</p>
                                         <p>
diff --git a/ru/next_steps.html b/ru/next_steps.html
index 2e3f9812..27180404 100644
--- a/ru/next_steps.html
+++ b/ru/next_steps.html
@@ -147,7 +147,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/ru/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Политика конфиденциальности</a>. <a href="https://u.fsf.org/yr">Присоединяйтесь.</a></p>
-                                        <p><em>Версия 2.0. <!--LANGUAGE translation by NAME, NAME and NAME.--></em></p><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Исходный код бота-автоответчика Эдварда разработан Josh Drake <zamnedix@gnu.org> и доступен в рамках стандартной общественной лицензии GNU.</a>
+                                        <p><em>Версия 2.0. <!--LANGUAGE translation by NAME, NAME and NAME.--></em></p><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Исходный код бота-автоответчика Эдварда разработан Josh Drake &lt;zamnedix@gnu.org&gt; и доступен в рамках стандартной общественной лицензии GNU.</a>
 <p>Изображения, представленные на данной странице, лицензированы в соответствии с <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (или более поздней версии)</a>, все остальное лицензировано в соответствии с <a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 license (или более поздней версии)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Почему эти лицензии?</a></p>
 					<p>Скачайте пакеты с исходным кодом для <a href="gnupg-guide.zip">данного руководства</a> и для <a href="gnupg-infographic.zip">инфографики</a>. Шрифты, использованные в данном руководстве &amp; инфографика: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> от Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> от Anna Giedry&#347; <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> от Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> от Florian Cramer.</p>
                                         <p>
diff --git a/ru/windows.html b/ru/windows.html
index 45f8fa71..2ce282e6 100644
--- a/ru/windows.html
+++ b/ru/windows.html
@@ -493,7 +493,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Политика конфиденциальности</a>. <a href="https://u.fsf.org/yr">Присоединяйтесь.</a></p>
-                                        <p><em>Версия 2.0. <!--LANGUAGE translation by NAME, NAME and NAME.--></em></p><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Исходный код бота-автоответчика Эдварда разработан Josh Drake <zamnedix@gnu.org> и доступен в рамках стандартной общественной лицензии GNU.</a>
+                                        <p><em>Версия 2.0. <!--LANGUAGE translation by NAME, NAME and NAME.--></em></p><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Исходный код бота-автоответчика Эдварда разработан Josh Drake &lt;zamnedix@gnu.org&gt; и доступен в рамках стандартной общественной лицензии GNU.</a>
 <p>Изображения, представленные на данной странице, лицензированы в соответствии с <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (или более поздней версии)</a>, все остальное лицензировано в соответствии с <a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 license (или более поздней версии)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Почему эти лицензии?</a></p>
 					<p>Скачайте пакеты с исходным кодом для <a href="gnupg-guide.zip">данного руководства</a> и для <a href="gnupg-infographic.zip">инфографики</a>. Шрифты, использованные в данном руководстве &amp; инфографика: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> от Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> от Anna Giedry&#347; <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> от Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> от Florian Cramer.</p>
                                         <p>
diff --git a/tr/confirmation.html b/tr/confirmation.html
index bdfe02e2..a16838c2 100644
--- a/tr/confirmation.html
+++ b/tr/confirmation.html
@@ -41,7 +41,7 @@
 					<h4><a href="https://u.fsf.org/ys"><img alt="Özgür Yazılım Vakfı" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Özgür Yazılım Vakfı</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Gizlilik Politikası</a>. <a href="https://u.fsf.org/yr">Katılın.</a></p>
                                         <p><em>Sürüm 2.0. Turkish translation by T. E. KALAYCI.</em></p>
-                                        <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source code of Edward reply bot by Josh Drake <zamnedix@gnu.org> available under the GNU General Public License.</a>
+                                        <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.</a>
 <p>Bu sayfadaki resimler <a href="https://creativecommons.org/licenses/by/4.0/deed.tr">Creative Commons Alıntı 4.0 lisansı (veya sonraki sürümü)</a> ile, geri kalan herşey <a href="https://creativecommons.org/licenses/by-sa/4.0/deed.tr">Creative Commons Atıf-LisansDevam 4.0 lisansı (veya sonraki sürümü)</a> ile lisanslanmıştır. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Neden bu lisanslar?</a></p>
 					<p>Bu rehberin <a href="gnupg-guide-tr.zip">kaynak kodlarını</a> indirebilirsiniz. Rehberde ve infografikte kullanılan yazı tipleri: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> (Pablo Impallari), <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> (Anna Giedry&#347;), <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> (Omnibus-Type), <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> (Florian Cramer).</p>
                                         <p>
diff --git a/tr/index.html b/tr/index.html
index 74e8fc25..de95c7bc 100644
--- a/tr/index.html
+++ b/tr/index.html
@@ -481,7 +481,7 @@ of this message encrypted." (OpenPGP: Bu mesajın bir kısmı şifrelenmiştir)
 					<h4><a href="https://u.fsf.org/ys"><img alt="Özgür Yazılım Vakfı" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Özgür Yazılım Vakfı</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Gizlilik Politikası</a>. <a href="https://u.fsf.org/yr">Katılın.</a></p>
                                         <p><em>Sürüm 2.0. Turkish translation by T. E. KALAYCI.</em></p>
-                                        <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source code of Edward reply bot by Josh Drake <zamnedix@gnu.org> available under the GNU General Public License.</a>
+                                        <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.</a>
 <p>Bu sayfadaki resimler <a href="https://creativecommons.org/licenses/by/4.0/deed.tr">Creative Commons Alıntı 4.0 lisansı (veya sonraki sürümü)</a> ile, geri kalan herşey <a href="https://creativecommons.org/licenses/by-sa/4.0/deed.tr">Creative Commons Atıf-LisansDevam 4.0 lisansı (veya sonraki sürümü)</a> ile lisanslanmıştır. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Neden bu lisanslar?</a></p>
 					<p>Bu rehberin <a href="gnupg-guide-tr.zip">kaynak kodlarını</a> indirebilirsiniz. Rehberde ve infografikte kullanılan yazı tipleri: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> (Pablo Impallari), <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> (Anna Giedry&#347;), <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> (Omnibus-Type), <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> (Florian Cramer).</p>
                                         <p>
diff --git a/tr/infographic.html b/tr/infographic.html
index e05e5f5d..528ed0cb 100644
--- a/tr/infographic.html
+++ b/tr/infographic.html
@@ -33,7 +33,7 @@
 					<h4><a href="https://u.fsf.org/ys"><img alt="Özgür Yazılım Vakfı" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Özgür Yazılım Vakfı</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Gizlilik Politikası</a>. <a href="https://u.fsf.org/yr">Katılın.</a></p>
                                         <p><em>Sürüm 2.0. Turkish translation by T. E. KALAYCI.</em></p>
-                                        <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source code of Edward reply bot by Josh Drake <zamnedix@gnu.org> available under the GNU General Public License.</a>
+                                        <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.</a>
 <p>Bu sayfadaki resimler <a href="https://creativecommons.org/licenses/by/4.0/deed.tr">Creative Commons Alıntı 4.0 lisansı (veya sonraki sürümü)</a> ile, geri kalan herşey <a href="https://creativecommons.org/licenses/by-sa/4.0/deed.tr">Creative Commons Atıf-LisansDevam 4.0 lisansı (veya sonraki sürümü)</a> ile lisanslanmıştır. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Neden bu lisanslar?</a></p>
 					<p>Bu rehberin <a href="gnupg-guide-tr.zip">kaynak kodlarını</a> indirebilirsiniz. Rehberde ve infografikte kullanılan yazı tipleri: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> (Pablo Impallari), <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> (Anna Giedry&#347;), <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> (Omnibus-Type), <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> (Florian Cramer).</p>
                                         <p>
diff --git a/tr/mac.html b/tr/mac.html
index 0aa7ce55..f128a7c5 100644
--- a/tr/mac.html
+++ b/tr/mac.html
@@ -489,7 +489,7 @@ of this message encrypted." (OpenPGP: Bu mesajın bir kısmı şifrelenmiştir)
 					<h4><a href="https://u.fsf.org/ys"><img alt="Özgür Yazılım Vakfı" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Özgür Yazılım Vakfı</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Gizlilik Politikası</a>. <a href="https://u.fsf.org/yr">Katılın.</a></p>
                                         <p><em>Sürüm 2.0. Turkish translation by T. E. KALAYCI.</em></p>
-                                        <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source code of Edward reply bot by Josh Drake <zamnedix@gnu.org> available under the GNU General Public License.</a>
+                                        <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.</a>
 <p>Bu sayfadaki resimler <a href="https://creativecommons.org/licenses/by/4.0/deed.tr">Creative Commons Alıntı 4.0 lisansı (veya sonraki sürümü)</a> ile, geri kalan herşey <a href="https://creativecommons.org/licenses/by-sa/4.0/deed.tr">Creative Commons Atıf-LisansDevam 4.0 lisansı (veya sonraki sürümü)</a> ile lisanslanmıştır. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Neden bu lisanslar?</a></p>
 					<p>Bu rehberin <a href="gnupg-guide-tr.zip">kaynak kodlarını</a> indirebilirsiniz. Rehberde ve infografikte kullanılan yazı tipleri: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> (Pablo Impallari), <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> (Anna Giedry&#347;), <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> (Omnibus-Type), <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> (Florian Cramer).</p>
                                         <p>
diff --git a/tr/next_steps.html b/tr/next_steps.html
index ad252b68..65ac1795 100644
--- a/tr/next_steps.html
+++ b/tr/next_steps.html
@@ -148,7 +148,7 @@
 					<h4><a href="https://u.fsf.org/ys"><img alt="Özgür Yazılım Vakfı" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Özgür Yazılım Vakfı</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Gizlilik Politikası</a>. <a href="https://u.fsf.org/yr">Katılın.</a></p>
                                         <p><em>Sürüm 2.0. Turkish translation by T. E. KALAYCI.</em></p>
-                                        <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source code of Edward reply bot by Josh Drake <zamnedix@gnu.org> available under the GNU General Public License.</a>
+                                        <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.</a>
 <p>Bu sayfadaki resimler <a href="https://creativecommons.org/licenses/by/4.0/deed.tr">Creative Commons Alıntı 4.0 lisansı (veya sonraki sürümü)</a> ile, geri kalan herşey <a href="https://creativecommons.org/licenses/by-sa/4.0/deed.tr">Creative Commons Atıf-LisansDevam 4.0 lisansı (veya sonraki sürümü)</a> ile lisanslanmıştır. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Neden bu lisanslar?</a></p>
 					<p>Bu rehberin <a href="gnupg-guide-tr.zip">kaynak kodlarını</a> indirebilirsiniz. Rehberde ve infografikte kullanılan yazı tipleri: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> (Pablo Impallari), <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> (Anna Giedry&#347;), <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> (Omnibus-Type), <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> (Florian Cramer).</p>
                                         <p>
diff --git a/tr/windows.html b/tr/windows.html
index a9883cae..d67eb34e 100644
--- a/tr/windows.html
+++ b/tr/windows.html
@@ -488,7 +488,7 @@ of this message encrypted." (OpenPGP: Bu mesajın bir kısmı şifrelenmiştir)
 					<h4><a href="https://u.fsf.org/ys"><img alt="Özgür Yazılım Vakfı" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Özgür Yazılım Vakfı</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Gizlilik Politikası</a>. <a href="https://u.fsf.org/yr">Katılın.</a></p>
                                         <p><em>Sürüm 2.0. Turkish translation by T. E. KALAYCI.</em></p>
-                                        <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source code of Edward reply bot by Josh Drake <zamnedix@gnu.org> available under the GNU General Public License.</a>
+                                        <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.</a>
 <p>Bu sayfadaki resimler <a href="https://creativecommons.org/licenses/by/4.0/deed.tr">Creative Commons Alıntı 4.0 lisansı (veya sonraki sürümü)</a> ile, geri kalan herşey <a href="https://creativecommons.org/licenses/by-sa/4.0/deed.tr">Creative Commons Atıf-LisansDevam 4.0 lisansı (veya sonraki sürümü)</a> ile lisanslanmıştır. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Neden bu lisanslar?</a></p>
 					<p>Bu rehberin <a href="gnupg-guide-tr.zip">kaynak kodlarını</a> indirebilirsiniz. Rehberde ve infografikte kullanılan yazı tipleri: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> (Pablo Impallari), <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> (Anna Giedry&#347;), <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> (Omnibus-Type), <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> (Florian Cramer).</p>
                                         <p>
-- 
2.25.1