All translations: global replacement Pump.io > Mastodon:

find . -name '*.html' > html.list
for f in $(< html.list); do
  sed -i -e 's,Pump\.io,Mastodon,' \
         -e 's,pump\.io,mastodon,' \
         -e 's,http://microca.st/fsf,https://hostux.social/@fsf,' $f;
done

diff --git a/ar/confirmation.html b/ar/confirmation.html
index 5af749a89c406285bf0a92f1032e1767ecaaa44a..b16fc5f200bbb3984100bdb58ffd420a99599e09 100644 (file)
--- a/ar/confirmation.html
+++ b/ar/confirmation.html
@@ -30,8 +30,8 @@
 <br /><p><img src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/section3-try-it-out.png" alt="Try it out." /></p><br />
 
 <p>Join us on microblogging services for day-to-day updates:</p>
-<p style="font-size:150%"><a href="https://status.fsf.org/fsf">GNU Social</a> | <a href="http://microca.st/fsf">Pump.io</a> | <a href="https://www.twitter.com/fsf">Twitter</a></p>
-<p><small><a href="https://www.fsf.org/twitter">Read why GNU Social and Pump.io are better than Twitter.</a></small></p>
+<p style="font-size:150%"><a href="https://status.fsf.org/fsf">GNU Social</a> | <a href="https://hostux.social/@fsf">Mastodon</a> | <a href="https://www.twitter.com/fsf">Twitter</a></p>
+<p><small><a href="https://www.fsf.org/twitter">Read why GNU Social and Mastodon are better than Twitter.</a></small></p>
 <hr />
                                        <p class="back" style="font-size:150%">&larr; Return to <a href="index.html">Email Self-Defense</a></p>
                        </div>

diff --git a/ar/next_steps.html b/ar/next_steps.html
index 793355775a7b02540e57f81e42f698871c0ee778..7dc44f5baad698309617c0898e8c4295b9b3d464 100644 (file)
--- a/ar/next_steps.html
+++ b/ar/next_steps.html
@@ -59,8 +59,8 @@
                                        </div><!-- End .newsletter -->
 <br />
 <p>Join us on microblogging services for day-to-day updates:</p>
-<p style="font-size:150%"><a href="https://status.fsf.org/fsf">GNU Social</a> | <a href="http://microca.st/fsf">Pump.io</a> | <a href="https://www.twitter.com/fsf">Twitter</a></p>
-<p><a href="https://www.fsf.org/twitter">Read why GNU Social and Pump.io are better than Twitter.</a></p>
+<p style="font-size:150%"><a href="https://status.fsf.org/fsf">GNU Social</a> | <a href="https://hostux.social/@fsf">Mastodon</a> | <a href="https://www.twitter.com/fsf">Twitter</a></p>
+<p><a href="https://www.fsf.org/twitter">Read why GNU Social and Mastodon are better than Twitter.</a></p>
 
                                        </div><!-- End .main -->
                                </div><!-- End #step-political .step -->

diff --git a/cs/confirmation.html b/cs/confirmation.html
index 0790c4780faaac9c954a0a5b437e607ad633b887..7596bec1e4ed110e1354c0342081be2029c37038 100644 (file)
--- a/cs/confirmation.html
+++ b/cs/confirmation.html
@@ -34,15 +34,15 @@ alt="Vyzkoušejte to." /></p><br />
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" />
-&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="http://microca.st/fsf"><img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="https://hostux.social/@fsf"><img
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />
-&nbsp;Pump.io</a>&nbsp; |&nbsp; <a
+alt="[Mastodon]" />
+&nbsp;Mastodon</a>&nbsp; |&nbsp; <a
 href="https://www.twitter.com/fsf">Twitter</a></p>
 
 <p><small><a href="https://www.fsf.org/twitter">Přečtěte si, proč jsou GNU
-Social a Pump.io lepší než Twitter.</a></small></p>
+Social a Mastodon lepší než Twitter.</a></small></p>
 
 <hr />
 

diff --git a/cs/index.html b/cs/index.html
index 5caccb5dda91132c206959105d3e8fbdb335768f..1f6c96a9c904d7e12f8f1d037f233f2d0fa1f358 100644 (file)
--- a/cs/index.html
+++ b/cs/index.html
@@ -56,8 +56,8 @@ href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
 for everyone via %40fsf">Sdílejte 
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png" class="share-logo"

diff --git a/cs/infographic.html b/cs/infographic.html
index 61cf534dce3a6912f4258ca58907ebe0ac0f354a..c9b978290ac9994cd1e25eb6f565a6140ba71d0a 100644 (file)
--- a/cs/infographic.html
+++ b/cs/infographic.html
@@ -25,9 +25,9 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"

diff --git a/cs/mac.html b/cs/mac.html
index ca9c54c957a408f2fadcf6f41c2691a7498673c2..e8a9c8faf116c44b81592a327352e8e5c936aa4b 100644 (file)
--- a/cs/mac.html
+++ b/cs/mac.html
@@ -56,8 +56,8 @@ href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
 for everyone via %40fsf">Sdílejte 
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png" class="share-logo"

diff --git a/cs/next_steps.html b/cs/next_steps.html
index 8fe85574f851e25f086faad0abe4be71a5ab8f4d..eec28821deb38704d33cc5a746cb955b23679874 100644 (file)
--- a/cs/next_steps.html
+++ b/cs/next_steps.html
@@ -65,15 +65,15 @@ s podobně smýšlejícími lidmi a pracujte s námi na změně.</p>
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" />
-&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="http://microca.st/fsf"><img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="https://hostux.social/@fsf"><img
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />
-&nbsp;Pump.io</a>&nbsp; |&nbsp; <a
+alt="[Mastodon]" />
+&nbsp;Mastodon</a>&nbsp; |&nbsp; <a
 href="https://www.twitter.com/fsf">Twitter</a></p>
 
 <p><small>Přečtěte si, <a href="https://www.fsf.org/twitter">proč je GNU Social
-a Pump.io lepší než Twitter</a> a <a href="http://www.fsf.org/facebook">proč
+a Mastodon lepší než Twitter</a> a <a href="http://www.fsf.org/facebook">proč
 nepoužíváme Facebook</a>.</small></p>
 
 <br />

diff --git a/cs/windows.html b/cs/windows.html
index a03dfbaff4ea734eea048ea91d7cc87d6518b6ff..2598429652b76a4291a66bdeddf35e88e58485e9 100644 (file)
--- a/cs/windows.html
+++ b/cs/windows.html
@@ -56,8 +56,8 @@ href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
 for everyone via %40fsf">Sdílejte 
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png" class="share-logo"

diff --git a/cs/workshops.html b/cs/workshops.html
index 471c4010c2163a8f72d3d1072a1b671c2e0bbfc1..e5a8c6b1a2c8273e39fadf9fdab3260129d7cedb 100644 (file)
--- a/cs/workshops.html
+++ b/cs/workshops.html
@@ -58,8 +58,8 @@ for everyone via %40fsf">Sdílejte 
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;

diff --git a/de/confirmation.html b/de/confirmation.html
index 11a68a2a8304373b9e59cd07235089f3856847a2..82cca42d78e660e7e0bfe08c39c02722c7f25020 100644 (file)
--- a/de/confirmation.html
+++ b/de/confirmation.html
@@ -37,15 +37,15 @@ alt="Probiere es aus." /></p><br />
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" />
-&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="http://microca.st/fsf"><img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="https://hostux.social/@fsf"><img
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />
-&nbsp;Pump.io</a>&nbsp; |&nbsp; <a
+alt="[Mastodon]" />
+&nbsp;Mastodon</a>&nbsp; |&nbsp; <a
 href="https://www.twitter.com/fsf">Twitter</a></p>
 
 <p><small><a href="https://www.fsf.org/twitter">Lies, warum GNU Social und
-Pump.io besser sind als Twitter.</a></small></p>
+Mastodon besser sind als Twitter.</a></small></p>
 
 <hr />
 

diff --git a/de/index.html b/de/index.html
index bdbd0677a6fee65374c66a28af358cec89ae435b..d5d5a6b602f79db394a4b5a4fe406e6dc17f7257 100644 (file)
--- a/de/index.html
+++ b/de/index.html
@@ -59,8 +59,8 @@ href="https://fsf.org/share?u=https://u.fsf.org/zb&t=E-Mail-Verschlüsselung
 für alle via %40fsf">Teilen 
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png" class="share-logo"

diff --git a/de/infographic.html b/de/infographic.html
index 04e60bed8d566300e6c003b49591fed0c69eaf3c..9f93c7535bc6b57e6ffdffe38faf0ef8a43593ac 100644 (file)
--- a/de/infographic.html
+++ b/de/infographic.html
@@ -27,9 +27,9 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"

diff --git a/de/kitchen/confirmation.t.html b/de/kitchen/confirmation.t.html
index c1a0bf87266a30cab0b262ad24e58b08d516ff61..8dea2d7a095d850b7598f23afeff9764f5c4870b 100644 (file)
--- a/de/kitchen/confirmation.t.html
+++ b/de/kitchen/confirmation.t.html
@@ -18,16 +18,16 @@
     <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
          class="share-logo" alt="[GNU Social]" />
     &nbsp;GNU Social</a>&nbsp; |&nbsp;
-  <a href="http://microca.st/fsf">
-    <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-         class="share-logo" alt="[Pump.io]" />
-    &nbsp;Pump.io</a>&nbsp; |&nbsp;
+  <a href="https://hostux.social/@fsf">
+    <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+         class="share-logo" alt="[Mastodon]" />
+    &nbsp;Mastodon</a>&nbsp; |&nbsp;
   <a href="https://www.twitter.com/fsf">Twitter</a>
 </p>
 <small>
   <p>
     <a href="https://www.fsf.org/twitter">
-      Lies, warum GNU Social und Pump.io besser sind als Twitter.
+      Lies, warum GNU Social und Mastodon besser sind als Twitter.
     </a>
   </p>
 </small>

diff --git a/de/kitchen/next_steps.t.html b/de/kitchen/next_steps.t.html
index d5ca41ad3d8afb51fe93b252d5f028565eee8516..b51746a30afc5238cad0e5543cae1b6d192abfae 100644 (file)
--- a/de/kitchen/next_steps.t.html
+++ b/de/kitchen/next_steps.t.html
@@ -30,8 +30,8 @@
 
 <p>Du hast gerade einen großen Schritt in Richtung Schutz deiner Privatsphäre getan. Aber wenn wir dies alle alleine tun, ist es nicht genug. Um die Massenüberwachung zu stürzen, müssen wir eine Bewegung aufbauen für die Autonomie und Freiheit aller Computernutzer. Trete der Community der Free Software Foundation bei, um Gleichgesinnte zu treffen und zusammen für einen Wandel zu arbeiten:</p>
 
-<p style="font-size:150%"><a href="https://status.fsf.org/fsf">GNU Social</a> | <a href="http://microca.st/fsf">Pump.io</a> | <a href="https://www.twitter.com/fsf">Twitter</a></p>
-<p><a href="https://www.fsf.org/twitter"><small>Lies, warum GNU Social und Pump.io besser sind als Twitter.</small></a></p>
+<p style="font-size:150%"><a href="https://status.fsf.org/fsf">GNU Social</a> | <a href="https://hostux.social/@fsf">Mastodon</a> | <a href="https://www.twitter.com/fsf">Twitter</a></p>
+<p><a href="https://www.fsf.org/twitter"><small>Lies, warum GNU Social und Mastodon besser sind als Twitter.</small></a></p>
 <br />
 <div class="newsletter">
 <p style="font-size:150%">Wenig frequentierte Mailingliste</p>
@@ -48,8 +48,8 @@
                                        </div><!-- End .newsletter -->
 <!-- <br>
 <p>Folge uns auf Microblogging-Diensten:</p>
-<p style="font-size:150%"><a href="https://status.fsf.org/fsf">GNU Social</a> | <a href="http://microca.st/fsf">Pump.io</a> | <a href="https://www.twitter.com/fsf">Twitter</a></p>
-<p><a href="https://www.fsf.org/twitter"><small>Lies, warum GNU Social und Pump.io besser sind als Twitter.</small></a></p>-->
+<p style="font-size:150%"><a href="https://status.fsf.org/fsf">GNU Social</a> | <a href="https://hostux.social/@fsf">Mastodon</a> | <a href="https://www.twitter.com/fsf">Twitter</a></p>
+<p><a href="https://www.fsf.org/twitter"><small>Lies, warum GNU Social und Mastodon besser sind als Twitter.</small></a></p>-->
 
                                        </div><!-- End .main -->
                                </div><!-- End #step-political .step -->

diff --git a/de/mac.html b/de/mac.html
index 6b3f3f584787b416b5dc2f031cc9016c1b823899..53cd5f739a1b90e3fb38e395524720864c8e4b1f 100644 (file)
--- a/de/mac.html
+++ b/de/mac.html
@@ -59,8 +59,8 @@ href="https://fsf.org/share?u=https://u.fsf.org/zb&t=E-Mail-Verschlüsselung
 für alle via %40fsf">Teilen 
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png" class="share-logo"

diff --git a/de/next_steps.html b/de/next_steps.html
index d8cddc3337f2827bea6293e7bfc7734e4d154832..4c603d94fc8f9aff71eb3d4e24e76dc6a89100c6 100644 (file)
--- a/de/next_steps.html
+++ b/de/next_steps.html
@@ -69,15 +69,15 @@ Wandel zu arbeiten.</p>
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" />
-&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="http://microca.st/fsf"><img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="https://hostux.social/@fsf"><img
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />
-&nbsp;Pump.io</a>&nbsp; |&nbsp; <a
+alt="[Mastodon]" />
+&nbsp;Mastodon</a>&nbsp; |&nbsp; <a
 href="https://www.twitter.com/fsf">Twitter</a></p>
 
 <p><small>Lies, <a href="https://www.fsf.org/twitter"> wieso GNU Social und
-Pump.io besser sind als Twitter</a>, und <a
+Mastodon besser sind als Twitter</a>, und <a
 href="http://www.fsf.org/facebook"> wieso wir Facebook nicht
 nutzen</a>.</small></p>
 

diff --git a/de/windows.html b/de/windows.html
index 29fa5fed97398a302055381ed22409f028f28f06..b278cff591bf0e31ef45abbf5eb8d00bc5a69ea2 100644 (file)
--- a/de/windows.html
+++ b/de/windows.html
@@ -59,8 +59,8 @@ href="https://fsf.org/share?u=https://u.fsf.org/zb&t=E-Mail-Verschlüsselung
 für alle via %40fsf">Teilen 
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png" class="share-logo"

diff --git a/de/workshops.html b/de/workshops.html
index 78f8d6a4cd4f356273e8884270ec231d255f9e15..1e3307bbc1cb530c7be1c86d8ac6ccc8c3ff62a7 100644 (file)
--- a/de/workshops.html
+++ b/de/workshops.html
@@ -2,7 +2,8 @@
 <html lang="en">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<title>E-Mail-Selbstverteidigung - Unterrichte deine Freunde!</title>
+<title>E-Mail-Selbstverteidigung - eine Anleitung zur Bekämpfung der Überwachung
+durch Verschlüsselung mit GnuPG</title>
 <meta name="keywords" content="GnuPG, GPG, openpgp, Überwachung, Privatsphäre, E-Mail, Enigmail" />
 <meta name="description" content="Die E-Mail Überwachung verstößt gegen unsere Grundrechte und macht die freie
 Meinungsäußerung riskant. Diese Anleitung zeigt dir in 40 Minuten, wie du
@@ -60,8 +61,8 @@ für alle via %40fsf">Teilen&nbsp;
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;

diff --git a/el/confirmation.html b/el/confirmation.html
index a532c48dcf7407e6d3b384548f14ecbc8956c23e..c74a3392b5b669b0dd757b377f5639068332762c 100644 (file)
--- a/el/confirmation.html
+++ b/el/confirmation.html
@@ -31,13 +31,13 @@
     <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
          class="share-logo" alt="[GNU Social]" />
     &nbsp;GNU Social</a>&nbsp; |&nbsp;
-  <a href="http://microca.st/fsf">
-    <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-         class="share-logo" alt="[Pump.io]" />
-    &nbsp;Pump.io</a>&nbsp |&nbsp;
+  <a href="https://hostux.social/@fsf">
+    <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+         class="share-logo" alt="[Mastodon]" />
+    &nbsp;Mastodon</a>&nbsp |&nbsp;
   <a href="https://www.twitter.com/fsf">Twitter</a>
 </p>
-<p><small><a href="https://www.fsf.org/twitter">Διάβασε γιατί το GNU Social και το Pump.io είναι καλύτερα από το Twitter.</a></small></p>
+<p><small><a href="https://www.fsf.org/twitter">Διάβασε γιατί το GNU Social και το Mastodon είναι καλύτερα από το Twitter.</a></small></p>
 <hr />
                                        <p class="back" style="font-size:150%">&larr; Επιστροφή στον <a href="index.html">Οδηγό Αυτοάμυνας με Email</a></p>
                        </div>

diff --git a/el/index.html b/el/index.html
index e5105232559bafea0732c726429e703c5c97de5a..baab9343dc82b32d865d9b003740511eb0ecc734 100644 (file)
--- a/el/index.html
+++ b/el/index.html
@@ -59,8 +59,8 @@
                                 Μοιρασου το 
                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
                                      class="share-logo" alt="[GNU Social]" />&nbsp;
-                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-                                      class="share-logo" alt="[Pump.io]" />&nbsp;
+                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+                                      class="share-logo" alt="[Mastodon]" />&nbsp;
                                  <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
                                       class="share-logo" alt="[Reddit]" />&nbsp;
                                  <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"

diff --git a/el/mac.html b/el/mac.html
index 49900c534508a554efdb6cf60c013fee7448f794..b7cc5e228be13a178b67593b6a47b30e14b1842a 100644 (file)
--- a/el/mac.html
+++ b/el/mac.html
@@ -59,8 +59,8 @@
                                 Μοιρασου το 
                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
                                      class="share-logo" alt="[GNU Social]" />&nbsp;
-                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-                                      class="share-logo" alt="[Pump.io]" />&nbsp;
+                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+                                      class="share-logo" alt="[Mastodon]" />&nbsp;
                                  <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
                                       class="share-logo" alt="[Reddit]" />&nbsp;
                                  <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"

diff --git a/el/next_steps.html b/el/next_steps.html
index d4119929c3eedf3439531a75e162f30eac54bf41..ae0fcce8b0ded692f8d6a97baff749c554a3204e 100644 (file)
--- a/el/next_steps.html
+++ b/el/next_steps.html
@@ -50,13 +50,13 @@
     <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
          class="share-logo" alt="[GNU Social]" />
     &nbsp;GNU Social</a>&nbsp; |&nbsp;
-  <a href="http://microca.st/fsf">
-    <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-         class="share-logo" alt="[Pump.io]" />
-    &nbsp;Pump.io</a>&nbsp; |&nbsp;
+  <a href="https://hostux.social/@fsf">
+    <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+         class="share-logo" alt="[Mastodon]" />
+    &nbsp;Mastodon</a>&nbsp; |&nbsp;
   <a href="https://www.twitter.com/fsf">Twitter</a>
 </p>
-<p><a href="https://www.fsf.org/twitter">Διάβασε γιατί το GNU Social και το Pump.io είναι καλύτερα από το Twitter.</a></p>
+<p><a href="https://www.fsf.org/twitter">Διάβασε γιατί το GNU Social και το Mastodon είναι καλύτερα από το Twitter.</a></p>
 
 <div class="newsletter">
 <p style="font-size:150%">Λίστα ενημερώσεων χαμηλής κυκλοφορίας</p>

diff --git a/el/windows.html b/el/windows.html
index 23a881ebfe77feca3db5c21c88ec386e81503f04..b85deb63d496f79a3f78efcb2bf44fb5ef9c3c27 100644 (file)
--- a/el/windows.html
+++ b/el/windows.html
@@ -59,8 +59,8 @@
                                 Μοιρασου το 
                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
                                      class="share-logo" alt="[GNU Social]" />&nbsp;
-                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-                                      class="share-logo" alt="[Pump.io]" />&nbsp;
+                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+                                      class="share-logo" alt="[Mastodon]" />&nbsp;
                                  <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
                                       class="share-logo" alt="[Reddit]" />&nbsp;
                                  <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"

diff --git a/es/confirmation.html b/es/confirmation.html
index 8774543b6b960a67f5c1133f0fc0a0584948bc3b..4294ec6daf181304b01d8e0725cd5cb82a89ff27 100644 (file)
--- a/es/confirmation.html
+++ b/es/confirmation.html
@@ -38,15 +38,15 @@ actualizaciones diarias:</p>
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" />
-&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="http://microca.st/fsf"><img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="https://hostux.social/@fsf"><img
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />
-&nbsp;Pump.io</a>&nbsp; |&nbsp; <a
+alt="[Mastodon]" />
+&nbsp;Mastodon</a>&nbsp; |&nbsp; <a
 href="https://www.twitter.com/fsf">Twitter</a></p>
 
 <p><small><a href="https://www.fsf.org/twitter">Lee por qué GNU Social y
-Pump.io son mejores que Twitter.</a></small></p>
+Mastodon son mejores que Twitter.</a></small></p>
 
 <hr />
 

diff --git a/es/index.html b/es/index.html
index 99f141ba61cbb4270a44f6b7c01c49e39ecce8f4..fe3f4002007da7c6e41bf5f2b1bab213a1c874fe 100644 (file)
--- a/es/index.html
+++ b/es/index.html
@@ -58,8 +58,8 @@ href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
 correo electrónico para todos via %40fsf"> Compartir 
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png" class="share-logo"

diff --git a/es/infographic.html b/es/infographic.html
index fe3c79f08c7c896c99b6edd24a6661c4eb876dee..c0166e68612b09f22c802d4aa22e72314b5a4d32 100644 (file)
--- a/es/infographic.html
+++ b/es/infographic.html
@@ -28,9 +28,9 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"

diff --git a/es/mac.html b/es/mac.html
index 8cee134451967976997326cb7d2e688bd93821e7..f63ad582666f7cb37acddd4bea1073826b4c50eb 100644 (file)
--- a/es/mac.html
+++ b/es/mac.html
@@ -58,8 +58,8 @@ href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
 correo electrónico para todos via %40fsf"> Compartir 
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png" class="share-logo"

diff --git a/es/next_steps.html b/es/next_steps.html
index f30eec853555745d078a10904e6f8c051fa17f02..b5d9e50e13d6e2d8a5be53efd9d43db7df4e2c14 100644 (file)
--- a/es/next_steps.html
+++ b/es/next_steps.html
@@ -69,15 +69,15 @@ trabajar juntos por el cambio.</p>
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" />
-&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="http://microca.st/fsf"><img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="https://hostux.social/@fsf"><img
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />
-&nbsp;Pump.io</a>&nbsp; |&nbsp; <a
+alt="[Mastodon]" />
+&nbsp;Mastodon</a>&nbsp; |&nbsp; <a
 href="https://www.twitter.com/fsf">Twitter</a></p>
 
 <p><small>Lee (en inglés) <a href="https://www.fsf.org/twitter">por qué GNU
-Social y Pump.io son mejores que Twitter</a>, y <a
+Social y Mastodon son mejores que Twitter</a>, y <a
 href="http://www.fsf.org/facebook">por qué no utilizamos
 Facebook</a>.</small></p>
 

diff --git a/es/windows.html b/es/windows.html
index b9cdf4283c77c38a377ca21e49601060f44f8c9e..48fd4594ae3c40e463602a22a4c897031db8c4a9 100644 (file)
--- a/es/windows.html
+++ b/es/windows.html
@@ -58,8 +58,8 @@ href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
 correo electrónico para todos via %40fsf"> Compartir 
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png" class="share-logo"

diff --git a/es/workshops.html b/es/workshops.html
index f7043144a7fa46bce042a588f8caedc8d88b5639..76af9807103ca0dac726de8bfc17c0f749d3e9f5 100644 (file)
--- a/es/workshops.html
+++ b/es/workshops.html
@@ -2,7 +2,8 @@
 <html lang="es">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<title>Defensa personal del correo electrónico - ¡Enseña a tus amigos!</title>
+<title>Defensa personal del correo electrónico: una guía para la lucha contra la
+vigilancia con el cifrado GnuPG</title>
 <meta name="keywords" content="GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail" />
 <meta name="description" content="La vigilancia del correo electrónico viola nuestros derechos fundamentales y
 pone en peligro la libertad de expresión. Esta guía te enseñará defensa
@@ -59,8 +60,8 @@ correo electrónico para todos via %40fsf"> Compartir&nbsp;
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;

diff --git a/fa/confirmation.html b/fa/confirmation.html
index 970f3c18ce2051d9415ee2fc4ab7847a467e806c..a029cfdea57b8aa94a6e17b04ba83bd64bc30d2c 100644 (file)
--- a/fa/confirmation.html
+++ b/fa/confirmation.html
@@ -35,15 +35,15 @@ alt="امتحان کنید" /></p><br />
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" />
-&nbsp;GNU Social</a>&nbsp; |&nbsp; <a dir="rtl" href="http://microca.st/fsf"><img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+&nbsp;GNU Social</a>&nbsp; |&nbsp; <a dir="rtl" href="https://hostux.social/@fsf"><img
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />
-&nbsp;Pump.io</a>&nbsp; |&nbsp; <a dir='rtl'
+alt="[Mastodon]" />
+&nbsp;Mastodon</a>&nbsp; |&nbsp; <a dir='rtl'
 href="https://www.twitter.com/fsf">Twitter</a></p>
 
 <p><small><a href="https://www.fsf.org/twitter">در مورد اینکه چرا Gnu Social و
-Pump.io از توئیتر بهتر هستند مطالعه کنید.</a></small></p>
+Mastodon از توئیتر بهتر هستند مطالعه کنید.</a></small></p>
 
 <hr />
 

diff --git a/fa/index.html b/fa/index.html
index 7c172549cfdaf310e9d1e9df8ab36280187d165b..06b1c68fb4509f28d836aa71264a0ca7c80bf78a 100644 (file)
--- a/fa/index.html
+++ b/fa/index.html
@@ -59,9 +59,9 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"

diff --git a/fa/infographic.html b/fa/infographic.html
index d639be8dfeaa933186e7690163397e8d329ee2d9..fb6752451510ca4d99fecace0479b359237ebc8b 100644 (file)
--- a/fa/infographic.html
+++ b/fa/infographic.html
@@ -27,9 +27,9 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"

diff --git a/fa/mac.html b/fa/mac.html
index c3aadddef67274e27b1018610bb29d84bbd8ba88..f181eed7f0bb7d5c49583b765bc4b10c943a963b 100644 (file)
--- a/fa/mac.html
+++ b/fa/mac.html
@@ -59,9 +59,9 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"

diff --git a/fa/next_steps.html b/fa/next_steps.html
index 5637644381127d5e668206c061eb94dc77152387..03e25d3b560ce20855104d2aff9d7f4d8ff943bd 100644 (file)
--- a/fa/next_steps.html
+++ b/fa/next_steps.html
@@ -59,15 +59,15 @@ alt="نمایش و اشتراک گذاری اینفوگرافیک‌های ما&
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" />
-&nbsp;GNU Social</a>&nbsp; |&nbsp; <a dir="rtl" href="http://microca.st/fsf"><img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+&nbsp;GNU Social</a>&nbsp; |&nbsp; <a dir="rtl" href="https://hostux.social/@fsf"><img
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />
-&nbsp;Pump.io</a>&nbsp; |&nbsp; <a dir='rtl'
+alt="[Mastodon]" />
+&nbsp;Mastodon</a>&nbsp; |&nbsp; <a dir='rtl'
 href="https://www.twitter.com/fsf">Twitter</a></p>
 
 <p><small>بخوانید <a href="https://www.fsf.org/twitter">چرا GNU Social و
-Pump.io بهتر از توئیتر هستندr</a>، و <a
+Mastodon بهتر از توئیتر هستندr</a>، و <a
 href="http://www.fsf.org/facebook">چرا ما از فیس بوک استفاده نمی
 کنیم</a>.</small></p>
 

diff --git a/fa/windows.html b/fa/windows.html
index c1d6311e23b4e80de01631b03e2c4042a73c72f5..2549f28890513004a134b96b2d0e48193287e760 100644 (file)
--- a/fa/windows.html
+++ b/fa/windows.html
@@ -59,9 +59,9 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"

diff --git a/fa/workshops.html b/fa/workshops.html
index a59214a7b43f6afb88065a38eded66487e9f46ca..b61170004359911e10bbd10d006cbe72638a027d 100644 (file)
--- a/fa/workshops.html
+++ b/fa/workshops.html
@@ -57,8 +57,8 @@ for everyone via %40fsf"> اشتراک گذاری 
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;

diff --git a/fr/confirmation.html b/fr/confirmation.html
index 8ded20abcd12e116cd990771579545abcee1be0f..2354accf0903b4419523155846d30c9f84dd304d 100644 (file)
--- a/fr/confirmation.html
+++ b/fr/confirmation.html
@@ -38,12 +38,12 @@ quotidiens&nbsp;:</p>
 <p style="font-size:150%"><a href="https://status.fsf.org/fsf"><img class="share-logo"
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 alt="[GNU Social]" />&nbsp;GNU Social</a>&nbsp; | &nbsp;
-<a href="http://microca.st/fsf"><img class="share-logo"
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-alt="[Pump.io]" />&nbsp;Pump.io</a>&nbsp; | &nbsp;
+<a href="https://hostux.social/@fsf"><img class="share-logo"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+alt="[Mastodon]" />&nbsp;Mastodon</a>&nbsp; | &nbsp;
 <a href="https://www.twitter.com/fsf">Twitter</a></p>
 
-<p><small><a href="https://www.fsf.org/twitter">Découvrez pourquoi GNU Social et Pump.io
+<p><small><a href="https://www.fsf.org/twitter">Découvrez pourquoi GNU Social et Mastodon
 sont mieux que Twitter.</a></small></p>
 
 <hr />

diff --git a/fr/index.html b/fr/index.html
index 38e124b6711758d67053330eba4bf5cde1c5881a..8d0178a801d698af0ea1a32999713b85ab10b372 100644 (file)
--- a/fr/index.html
+++ b/fr/index.html
@@ -53,9 +53,9 @@ confidentialité, courriel, Enigmail" />
 href="https://fsf.org/share?u=https://u.fsf.org/zb&t=Chiffrement du courriel pour tous avec %40fsf">
 Partagez&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
-alt="[GNU Social]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+alt="[GNU Social]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
+alt="[Mastodon]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"
 alt="[Reddit]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"
 class="share-logo"

diff --git a/fr/infographic.html b/fr/infographic.html
index 615cf6f7e8fa85be27b9faf13475e47b5972ac5b..779fe2e61b7aa1938ef72c287b40a2a99646f319 100644 (file)
--- a/fr/infographic.html
+++ b/fr/infographic.html
@@ -23,8 +23,8 @@ confidentialité, courriel, Enigmail" />
 href="https://fsf.org/share?u=https://u.fsf.org/zc&amp;t=Le&nbsp;chiffrement,&nbsp;comment&nbsp;ça&nbsp;marche.&nbsp;Infographie&nbsp;via&nbsp;%40fsf"><img
 class="share-logo" src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 alt="[GNU Social]" />&nbsp; <img class="share-logo"
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-alt="[Pump.io]" />&nbsp; <img class="share-logo"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+alt="[https://hostux.social/@fsf]" />&nbsp; <img class="share-logo"
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 alt="[Reddit]" />&nbsp; <img class="share-logo"
 src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"

diff --git a/fr/kitchen/confirmation.t.html b/fr/kitchen/confirmation.t.html
index b1dfde0b43ce34ec495c03e6a18833b62536891a..8a334a6cdf0fcc24557b6e78b4e0708fc4c41a4f 100644 (file)
--- a/fr/kitchen/confirmation.t.html
+++ b/fr/kitchen/confirmation.t.html
@@ -22,12 +22,12 @@ quotidiens&nbsp;:</p>
 <p style="font-size:150%"><a href="https://status.fsf.org/fsf"><img class="share-logo"
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 alt="[GNU Social]" />&nbsp;GNU Social</a>&nbsp; | &nbsp;
-<a href="http://microca.st/fsf"><img class="share-logo"
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-alt="[Pump.io]" />&nbsp;Pump.io</a>&nbsp; | &nbsp;
+<a href="https://hostux.social/@fsf"><img class="share-logo"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+alt="[Mastodon]" />&nbsp;Mastodon</a>&nbsp; | &nbsp;
 <a href="https://www.twitter.com/fsf">Twitter</a></p>
 
-<p><small><a href="https://www.fsf.org/twitter">Découvrez pourquoi GNU Social et Pump.io
+<p><small><a href="https://www.fsf.org/twitter">Découvrez pourquoi GNU Social et Mastodon
 sont mieux que Twitter.</a></small></p>
 
 <hr />

diff --git a/fr/kitchen/index.t.html b/fr/kitchen/index.t.html
index 2ac58e328350c7cbe29d67bbb508dae706fd94aa..51cb19d974bb540617a38afb40f075ea83a56446 100644 (file)
--- a/fr/kitchen/index.t.html
+++ b/fr/kitchen/index.t.html
@@ -26,9 +26,9 @@
 href="https://fsf.org/share?u=https://u.fsf.org/zb&t=Chiffrement du courriel pour tous avec %40fsf">
 Partagez&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
-alt="[GNU Social]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+alt="[GNU Social]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
+alt="[Mastodon]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"
 alt="[Reddit]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"
 class="share-logo"

diff --git a/fr/kitchen/infographic.t.html b/fr/kitchen/infographic.t.html
index 238bbc5b7a537d902d8cb272191f0d42425b924b..5ae962b0c725e7c2725b1f53369fb08174d7f6a4 100644 (file)
--- a/fr/kitchen/infographic.t.html
+++ b/fr/kitchen/infographic.t.html
@@ -7,8 +7,8 @@
 href="https://fsf.org/share?u=https://u.fsf.org/zc&amp;t=Le&nbsp;chiffrement,&nbsp;comment&nbsp;ça&nbsp;marche.&nbsp;Infographie&nbsp;via&nbsp;%40fsf"><img
 class="share-logo" src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 alt="[GNU Social]" />&nbsp; <img class="share-logo"
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-alt="[Pump.io]" />&nbsp; <img class="share-logo"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+alt="[https://hostux.social/@fsf]" />&nbsp; <img class="share-logo"
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 alt="[Reddit]" />&nbsp; <img class="share-logo"
 src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"

diff --git a/fr/kitchen/next_steps.t.html b/fr/kitchen/next_steps.t.html
index ccfde5fd105bcb819adc500988c5939a042357b3..201229a97fa199e93a856cc68d3618cc6a17a633 100644 (file)
--- a/fr/kitchen/next_steps.t.html
+++ b/fr/kitchen/next_steps.t.html
@@ -43,13 +43,13 @@ pour le changement.</p>
 
 <p style="font-size:150%"> <a href="https://status.fsf.org/fsf"> <img
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
-alt="[GNU Social]" /> &nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="http://microca.st/fsf">
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />
-&nbsp;Pump.io</a>&nbsp; |&nbsp; <a href="https://www.twitter.com/fsf">Twitter</a> </p>
+alt="[GNU Social]" /> &nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="https://hostux.social/@fsf">
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />
+&nbsp;Mastodon</a>&nbsp; |&nbsp; <a href="https://www.twitter.com/fsf">Twitter</a> </p>
 
 <p><small>Découvrez <a href="https://www.fsf.org/twitter"> pourquoi GNU Social et
-Pump.io sont mieux que Twitter</a> et <a href="http://www.fsf.org/facebook"> pourquoi nous
+Mastodon sont mieux que Twitter</a> et <a href="http://www.fsf.org/facebook"> pourquoi nous
 n'utilisons pas Facebook</a>.</small></p>
 
 <br /> <div class="newsletter">

diff --git a/fr/kitchen/workshops.t.html b/fr/kitchen/workshops.t.html
index 82c02f4b216c4b8276310de778725a5cf3c01ded..f4cb1a48badc22a111f77fd357d5c2d9386374f3 100644 (file)
--- a/fr/kitchen/workshops.t.html
+++ b/fr/kitchen/workshops.t.html
@@ -16,9 +16,9 @@
 href="https://fsf.org/share?u=https://u.fsf.org/zb&t=Chiffrement du courriel pour tous avec %40fsf">
 Partagez&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
-alt="[GNU Social]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+alt="[GNU Social]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
+alt="[Mastodon]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"
 alt="[Reddit]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"
 class="share-logo"

diff --git a/fr/mac.html b/fr/mac.html
index 4b0888fb89f5cd705a90ac21f2368201eb7d8a80..69f5e60545fef15b713c4d418b73d024d3cec44f 100644 (file)
--- a/fr/mac.html
+++ b/fr/mac.html
@@ -53,9 +53,9 @@ confidentialité, courriel, Enigmail" />
 href="https://fsf.org/share?u=https://u.fsf.org/zb&t=Chiffrement du courriel pour tous avec %40fsf">
 Partagez&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
-alt="[GNU Social]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+alt="[GNU Social]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
+alt="[Mastodon]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"
 alt="[Reddit]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"
 class="share-logo"

diff --git a/fr/next_steps.html b/fr/next_steps.html
index 356d94ac9c70c8da8cb81805f7c77107990e750d..fd15c7917ef96f4a47c1f6202e5fb6ac46fc4b22 100644 (file)
--- a/fr/next_steps.html
+++ b/fr/next_steps.html
@@ -59,13 +59,13 @@ pour le changement.</p>
 
 <p style="font-size:150%"> <a href="https://status.fsf.org/fsf"> <img
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
-alt="[GNU Social]" /> &nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="http://microca.st/fsf">
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />
-&nbsp;Pump.io</a>&nbsp; |&nbsp; <a href="https://www.twitter.com/fsf">Twitter</a> </p>
+alt="[GNU Social]" /> &nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="https://hostux.social/@fsf">
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />
+&nbsp;Mastodon</a>&nbsp; |&nbsp; <a href="https://www.twitter.com/fsf">Twitter</a> </p>
 
 <p><small>Découvrez <a href="https://www.fsf.org/twitter"> pourquoi GNU Social et
-Pump.io sont mieux que Twitter</a> et <a href="http://www.fsf.org/facebook"> pourquoi nous
+Mastodon sont mieux que Twitter</a> et <a href="http://www.fsf.org/facebook"> pourquoi nous
 n'utilisons pas Facebook</a>.</small></p>
 
 <br /> <div class="newsletter">

diff --git a/fr/windows.html b/fr/windows.html
index dbb2c3d3c39ed8aa4ff38225884fb14996e9a146..907aeee2b260a228eb304ea20a9e9571176b25e5 100644 (file)
--- a/fr/windows.html
+++ b/fr/windows.html
@@ -53,9 +53,9 @@ confidentialité, courriel, Enigmail" />
 href="https://fsf.org/share?u=https://u.fsf.org/zb&t=Chiffrement du courriel pour tous avec %40fsf">
 Partagez&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
-alt="[GNU Social]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+alt="[GNU Social]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
+alt="[Mastodon]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"
 alt="[Reddit]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"
 class="share-logo"

diff --git a/fr/workshops.html b/fr/workshops.html
index ca5d687bcf1382212dd47d58031689ad0989f48a..86940d8e8d9f74f70f37b7fc244106beaa9af9e6 100644 (file)
--- a/fr/workshops.html
+++ b/fr/workshops.html
@@ -54,9 +54,9 @@ confidentialité, courriel, Enigmail" />
 href="https://fsf.org/share?u=https://u.fsf.org/zb&t=Chiffrement du courriel pour tous avec %40fsf">
 Partagez&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
-alt="[GNU Social]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+alt="[GNU Social]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
+alt="[Mastodon]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"
 alt="[Reddit]" />&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"
 class="share-logo"

diff --git a/it/confirmation.html b/it/confirmation.html
index cf6b743ea65ab242586a12cb6970485c0964cbda..ac6fa752c4dd4f25803de5092db9fe3fff9c877d 100644 (file)
--- a/it/confirmation.html
+++ b/it/confirmation.html
@@ -30,13 +30,13 @@
     <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
          class="share-logo" alt="[GNU Social]" />
     &nbsp;GNU Social</a>&nbsp; |&nbsp;
-  <a href="http://microca.st/fsf">
-    <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-         class="share-logo" alt="[Pump.io]" />
-    &nbsp;Pump.io</a>&nbsp; |&nbsp;
+  <a href="https://hostux.social/@fsf">
+    <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+         class="share-logo" alt="[Mastodon]" />
+    &nbsp;Mastodon</a>&nbsp; |&nbsp;
   <a href="https://www.twitter.com/fsf">Twitter</a>
 </p>
-<p><small><a href="https://www.fsf.org/twitter">Leggi perchè GNU Social e Pump.io sono migliori rispetto a Twitter.</a></small></p>
+<p><small><a href="https://www.fsf.org/twitter">Leggi perchè GNU Social e Mastodon sono migliori rispetto a Twitter.</a></small></p>
 <hr />
                                        <p class="back" style="font-size:150%">&larr; Ritorna in <a href="index.html">Autodifesa Email</a></p>
                        </div>

diff --git a/it/index.html b/it/index.html
index 97dacdfecc84cd75737043c27a61ff88cda929fc..014dafa76ed534de37c1fdacef8b1caea197c7f0 100644 (file)
--- a/it/index.html
+++ b/it/index.html
@@ -59,8 +59,8 @@
                                 Condividi!
                                <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png" class="share-logo"

diff --git a/it/mac.html b/it/mac.html
index d77742238b3894a186bb4fad4e9dc90d1e513650..f23bbd6e516124a48e13b5a461a9a559ae715e9b 100644 (file)
--- a/it/mac.html
+++ b/it/mac.html
@@ -58,8 +58,8 @@
                                Condividi!
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png" class="share-logo"

diff --git a/it/next_steps.html b/it/next_steps.html
index 02fabefa1d0be8175a78a8c686ead5b1793e9fb1..1036830ff3c35292124d13a38c43c8aebb142d1f 100644 (file)
--- a/it/next_steps.html
+++ b/it/next_steps.html
@@ -48,13 +48,13 @@
     <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
          class="share-logo" alt="[GNU Social]" />
     &nbsp;GNU Social</a>&nbsp; |&nbsp;
-  <a href="http://microca.st/fsf">
-    <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-         class="share-logo" alt="[Pump.io]" />
-    &nbsp;Pump.io</a>&nbsp; |&nbsp;
+  <a href="https://hostux.social/@fsf">
+    <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+         class="share-logo" alt="[Mastodon]" />
+    &nbsp;Mastodon</a>&nbsp; |&nbsp;
   <a href="https://www.twitter.com/fsf">Twitter</a>
 </p>
-<p><a href="https://www.fsf.org/twitter"><small>Leggi perchè Gnu Social e Pump.io sono migliori rispetto a twitter.</small></a></p>
+<p><a href="https://www.fsf.org/twitter"><small>Leggi perchè Gnu Social e Mastodon sono migliori rispetto a twitter.</small></a></p>
 <br />
 <div class="newsletter">
 <p style="font-size:150%">Mailing list a basso volume di mail</p>

diff --git a/it/windows.html b/it/windows.html
index 7769be57e99415d2995cb80e8890c774a672b087..7f1c358e96faf45d79a2f4da4b9911da4852960b 100644 (file)
--- a/it/windows.html
+++ b/it/windows.html
@@ -59,8 +59,8 @@
                                 Condividi!
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png" class="share-logo"

diff --git a/ja/confirmation.html b/ja/confirmation.html
index 4cb83c0622cd52aaf879e40a0aa85354433a0c06..d5faf37a91c07e4594473d0e7936ab1d6e8e5d60 100644 (file)
--- a/ja/confirmation.html
+++ b/ja/confirmation.html
@@ -32,15 +32,15 @@ alt="やってみよう。" /></p><br />
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" />
-&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="http://microca.st/fsf"><img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="https://hostux.social/@fsf"><img
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />
-&nbsp;Pump.io</a>&nbsp; |&nbsp; <a
+alt="[Mastodon]" />
+&nbsp;Mastodon</a>&nbsp; |&nbsp; <a
 href="https://www.twitter.com/fsf">Twitter</a></p>
 
 <p><small><a href="https://www.fsf.org/twitter">GNU
-SocialやPump.ioがTwitterよりも優れている理由を読んでください。</a></small></p>
+SocialやMastodonがTwitterよりも優れている理由を読んでください。</a></small></p>
 
 <hr />
 

diff --git a/ja/index.html b/ja/index.html
index e976041d4bc20316a89ad94fcb33e58586af4108..0ccc3cad8913638d5f48ffaa25478f0c5d078a54 100644 (file)
--- a/ja/index.html
+++ b/ja/index.html
@@ -59,9 +59,9 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"

diff --git a/ja/infographic.html b/ja/infographic.html
index 6b67526e61658f242e852ca939d09967aa5d5626..2ce7e6dbef53a152791087739b2c9eb78992f5d7 100644 (file)
--- a/ja/infographic.html
+++ b/ja/infographic.html
@@ -25,9 +25,9 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"

diff --git a/ja/mac.html b/ja/mac.html
index 333f7449630f990c62d814a7793c5673ab054fc6..3140f70055059c4e130fd2c6e5c7c08d968e4d04 100644 (file)
--- a/ja/mac.html
+++ b/ja/mac.html
@@ -59,9 +59,9 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"

diff --git a/ja/next_steps.html b/ja/next_steps.html
index ba3dd7797321d694fcdc746a4041774b3bd3e337..d1c28ef27d21173c02d8b09f54fb3a2336554e20 100644 (file)
--- a/ja/next_steps.html
+++ b/ja/next_steps.html
@@ -60,15 +60,15 @@ alt="わたしたちのインフォグラフィックを見て共有する &rarr
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" />
-&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="http://microca.st/fsf"><img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="https://hostux.social/@fsf"><img
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />
-&nbsp;Pump.io</a>&nbsp; |&nbsp; <a
+alt="[Mastodon]" />
+&nbsp;Mastodon</a>&nbsp; |&nbsp; <a
 href="https://www.twitter.com/fsf">Twitter</a></p>
 
 <p><small><a href="https://www.fsf.org/twitter">GNU
-SocialやPump.ioがTwitterよりも優れている理由</a>と<a
+SocialやMastodonがTwitterよりも優れている理由</a>と<a
 href="http://www.fsf.org/facebook">わたしたちがFacebookを使わない理由</a>を読んでください。</small></p>
 
 <br />

diff --git a/ja/windows.html b/ja/windows.html
index 2d9117d1f1f4eb66aff9f891a14fc1516a9d602b..8d01aaf981fc16c33d4409b5212290b84587f817 100644 (file)
--- a/ja/windows.html
+++ b/ja/windows.html
@@ -59,9 +59,9 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"

diff --git a/ja/workshops.html b/ja/workshops.html
index 092ab10e332d7793213143776395a6d182574abc..02fdcd661c905fd2bd9fb2797fe217538976f12a 100644 (file)
--- a/ja/workshops.html
+++ b/ja/workshops.html
@@ -58,8 +58,8 @@ for everyone via %40fsf">共有
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;

diff --git a/ko/confirmation.html b/ko/confirmation.html
index 3ba6342bc76f72a3c3d491573864655f28725d67..38484a99588535089ae9585fb350d4055b0b5f5e 100644 (file)
--- a/ko/confirmation.html
+++ b/ko/confirmation.html
@@ -34,13 +34,13 @@
     <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
          class="share-logo" alt="[GNU Social]" />
     &nbsp;GNU 소셜</a>&nbsp; |&nbsp;
-  <a href="http://microca.st/fsf">
-    <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-         class="share-logo" alt="[Pump.io]" />
-    &nbsp;Pump.io</a>&nbsp; |&nbsp;
+  <a href="https://hostux.social/@fsf">
+    <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+         class="share-logo" alt="[Mastodon]" />
+    &nbsp;Mastodon</a>&nbsp; |&nbsp;
   <a href="https://www.twitter.com/fsf">트위터</a>
 </p>
-<p><small><a href="https://www.fsf.org/twitter">왜 GNU 소셜과 pump.io가 트위터보다 나은지 알아보세요.</a></small></p>
+<p><small><a href="https://www.fsf.org/twitter">왜 GNU 소셜과 mastodon가 트위터보다 나은지 알아보세요.</a></small></p>
 <hr />
                                        <p class="back" style="font-size:150%">&larr; <a href="index.html">이메일 스스로 보호하기</a> 매뉴얼로 돌아가기</p>
                        </div>

diff --git a/ko/index.html b/ko/index.html
index 8c2b46b8c8fb2cc455db5a40ebf418fcd23cc1a9..a9a5f9374c9b209fee150555faec5660ff023365 100644 (file)
--- a/ko/index.html
+++ b/ko/index.html
@@ -62,8 +62,8 @@
                                  Share 
                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
                                      class="share-logo" alt="[GNU Social]" />&nbsp;
-                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-                                      class="share-logo" alt="[Pump.io]" />&nbsp;
+                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+                                      class="share-logo" alt="[Mastodon]" />&nbsp;
                                  <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
                                       class="share-logo" alt="[Reddit]" />&nbsp;
                                  <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"

diff --git a/ko/mac.html b/ko/mac.html
index 2b5e6a08caab0d98d2dc780b05b766dc9aa2ea7e..426966142915d87ad2be9799d3627ec011bdbda4 100644 (file)
--- a/ko/mac.html
+++ b/ko/mac.html
@@ -55,8 +55,8 @@
                                 Share 
                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
                                      class="share-logo" alt="[GNU Social]" />&nbsp;
-                                <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-                                     class="share-logo" alt="[Pump.io]" />&nbsp;
+                                <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+                                     class="share-logo" alt="[Mastodon]" />&nbsp;
                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
                                      class="share-logo" alt="[Reddit]" />&nbsp;
                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"

diff --git a/ko/next_steps.html b/ko/next_steps.html
index a210105f701a3aef5d631562c0b126368869b4ef..3be2904f65291a7bb544b7d54304f788a8cc984b 100644 (file)
--- a/ko/next_steps.html
+++ b/ko/next_steps.html
@@ -65,14 +65,14 @@
          class="share-logo" alt="[GNU Social]" />
      GNU 소셜
   </a> |&nbsp;
-  <a href="http://microca.st/fsf">
-    <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-         class="share-logo" alt="[Pump.io]" />
-    &nbsp;Pump.io
+  <a href="https://hostux.social/@fsf">
+    <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+         class="share-logo" alt="[Mastodon]" />
+    &nbsp;Mastodon
   </a> |&nbsp;
   <a href="https://www.twitter.com/fsf">트위터</a>
 </p>
-<p><small><a href="https://www.fsf.org/twitter">왜 GNU 소셜과 pump.io가 트위터보다 나은지 알아보세요.</a></small></p>
+<p><small><a href="https://www.fsf.org/twitter">왜 GNU 소셜과 mastodon가 트위터보다 나은지 알아보세요.</a></small></p>
 
                                        </div><!-- End .main -->
                                </div><!-- End #step-political .step -->

diff --git a/ko/windows.html b/ko/windows.html
index 9329045643ad1489016a15a79ffc3593d848afbe..fc022ed297e54878563c378bb22ca9b6d0f975fe 100644 (file)
--- a/ko/windows.html
+++ b/ko/windows.html
@@ -56,8 +56,8 @@
                                 Share 
                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
                                      class="share-logo" alt="[GNU Social]" />&nbsp;
-                                <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-                                     class="share-logo" alt="[Pump.io]" />&nbsp;
+                                <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+                                     class="share-logo" alt="[Mastodon]" />&nbsp;
                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
                                      class="share-logo" alt="[Reddit]" />&nbsp;
                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"

diff --git a/ml/confirmation.html b/ml/confirmation.html
index 67279f91b42f793a0f45518bfb3d848828420e7a..833e4035324819939e592981ec30f3b7a6c1d649 100644 (file)
--- a/ml/confirmation.html
+++ b/ml/confirmation.html
@@ -34,13 +34,13 @@
     <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
          class="share-logo" alt="[GNU Social]" />
     &nbsp;GNU Social</a>&nbsp; |&nbsp;
-  <a href="http://microca.st/fsf">
-    <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-         class="share-logo" alt="[Pump.io]" />
-    &nbsp;Pump.io</a>&nbsp; |&nbsp;
+  <a href="https://hostux.social/@fsf">
+    <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+         class="share-logo" alt="[Mastodon]" />
+    &nbsp;Mastodon</a>&nbsp; |&nbsp;
   <a href="https://www.twitter.com/fsf">Twitter</a>
 </p>
-<p><small><a href="https://www.fsf.org/twitter">Read why GNU Social and Pump.io are better than Twitter.</a></small></p>
+<p><small><a href="https://www.fsf.org/twitter">Read why GNU Social and Mastodon are better than Twitter.</a></small></p>
 <hr />
                                        <p class="back" style="font-size:150%">&larr; Return to <a href="index.html">Email Self-Defense</a></p>
                        </div>

diff --git a/ml/index.html b/ml/index.html
index c16193d31fd5121b2344df98c122a12660a48429..6c7bd3f0a179dbf629ba27db1cb18339e7e696fe 100644 (file)
--- a/ml/index.html
+++ b/ml/index.html
@@ -62,8 +62,8 @@
                                  Share 
                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
                                      class="share-logo" alt="[GNU Social]" />&nbsp;
-                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-                                      class="share-logo" alt="[Pump.io]" />&nbsp;
+                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+                                      class="share-logo" alt="[Mastodon]" />&nbsp;
                                  <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
                                       class="share-logo" alt="[Reddit]" />&nbsp;
                                  <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"

diff --git a/ml/mac.html b/ml/mac.html
index 597e148db06dc5d74568e745334b62a751b94901..55d122240313cde8923404275007167cb241a936 100644 (file)
--- a/ml/mac.html
+++ b/ml/mac.html
@@ -55,8 +55,8 @@
                                 Share 
                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
                                      class="share-logo" alt="[GNU Social]" />&nbsp;
-                                <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-                                     class="share-logo" alt="[Pump.io]" />&nbsp;
+                                <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+                                     class="share-logo" alt="[Mastodon]" />&nbsp;
                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
                                      class="share-logo" alt="[Reddit]" />&nbsp;
                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"

diff --git a/ml/next_steps.html b/ml/next_steps.html
index c2d9d6daf5997accad882b3c01a1cae1115cd4f7..51881030925106bae8f5542df247c3a03c8e4bcc 100644 (file)
--- a/ml/next_steps.html
+++ b/ml/next_steps.html
@@ -64,13 +64,13 @@
     <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
          class="share-logo" alt="[GNU Social]" />
     &nbsp;GNU Social</a>&nbsp; |&nbsp;
-  <a href="http://microca.st/fsf">
-    <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-         class="share-logo" alt="[Pump.io]" />
-    &nbsp;Pump.io</a>&nbsp; |&nbsp;
+  <a href="https://hostux.social/@fsf">
+    <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+         class="share-logo" alt="[Mastodon]" />
+    &nbsp;Mastodon</a>&nbsp; |&nbsp;
   <a href="https://www.twitter.com/fsf">Twitter</a>
 </p>
-<p><small><a href="https://www.fsf.org/twitter">Read why GNU Social and Pump.io are better than Twitter.</a></small></p>
+<p><small><a href="https://www.fsf.org/twitter">Read why GNU Social and Mastodon are better than Twitter.</a></small></p>
 
                                        </div><!-- End .main -->
                                </div><!-- End #step-political .step -->

diff --git a/ml/windows.html b/ml/windows.html
index e256df4155fe566a914f80122aff3d47de64271c..c597186fe33f908e406ebb8781691321e131d894 100644 (file)
--- a/ml/windows.html
+++ b/ml/windows.html
@@ -56,8 +56,8 @@
                                 Share 
                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
                                      class="share-logo" alt="[GNU Social]" />&nbsp;
-                                <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-                                     class="share-logo" alt="[Pump.io]" />&nbsp;
+                                <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+                                     class="share-logo" alt="[Mastodon]" />&nbsp;
                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
                                      class="share-logo" alt="[Reddit]" />&nbsp;
                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"

diff --git a/pt-br/confirmation.html b/pt-br/confirmation.html
index 4f1d8db568532f89d938191277187ddaedc664f3..005e34af5468270f00d1ef624192a234d494d7e0 100644 (file)
--- a/pt-br/confirmation.html
+++ b/pt-br/confirmation.html
@@ -37,15 +37,15 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" />
 &nbsp;GNU Social</a>&nbsp; |&nbsp;
-<a href="http://microca.st/fsf"><img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+<a href="https://hostux.social/@fsf"><img
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />
-&nbsp;Pump.io</a>&nbsp; |&nbsp;
+alt="[Mastodon]" />
+&nbsp;Mastodon</a>&nbsp; |&nbsp;
 <a href="https://www.twitter.com/fsf">Twitter</a></p>
 
 <p><small><a href="https://www.fsf.org/twitter">Leia por quê o GNU Social
-e o Pump.io são melhores que o Twitter (em inglês).</a></small></p>
+e o Mastodon são melhores que o Twitter (em inglês).</a></small></p>
 
 <hr />
 

diff --git a/pt-br/index.html b/pt-br/index.html
index 8f8d94750ac3107a856512553336ce3c15a50d05..0aeeb5e23bf13cd70c04fb35e5a85719151ccd5e 100644 (file)
--- a/pt-br/index.html
+++ b/pt-br/index.html
@@ -57,9 +57,9 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"

diff --git a/pt-br/mac.html b/pt-br/mac.html
index 131f7a219f1c8113311828b0a07bfba051b38ebf..7cab4939817ee754e38ad92d568defac229d9593 100644 (file)
--- a/pt-br/mac.html
+++ b/pt-br/mac.html
@@ -57,9 +57,9 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"

diff --git a/pt-br/next_steps.html b/pt-br/next_steps.html
index 8bfde7967c75eb48daafb667ac9abc833e3ab6b9..60a61dcd7ef3812936f0aed907a01978e16eb2a7 100644 (file)
--- a/pt-br/next_steps.html
+++ b/pt-br/next_steps.html
@@ -63,15 +63,15 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" />
 &nbsp;GNU Social</a>&nbsp; |&nbsp;
-<a href="http://microca.st/fsf"><img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+<a href="https://hostux.social/@fsf"><img
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />
-&nbsp;Pump.io</a>&nbsp; |&nbsp;
+alt="[Mastodon]" />
+&nbsp;Mastodon</a>&nbsp; |&nbsp;
 <a href="https://www.twitter.com/fsf">Twitter</a></p>
 
 <p><small><a href="https://www.fsf.org/twitter?set_language=pt-br">Leia
-por quê o GNU Social e o Pump.io são melhores que o Twitter (em
+por quê o GNU Social e o Mastodon são melhores que o Twitter (em
 inglês)</a></small></p>
 
 <br />

diff --git a/pt-br/windows.html b/pt-br/windows.html
index d72b8162ead9ed3740867e77f61c05d8cb89894d..64b940b61f5001ae18082093209c4a79a0306ba6 100644 (file)
--- a/pt-br/windows.html
+++ b/pt-br/windows.html
@@ -57,9 +57,9 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"

diff --git a/ro/confirmation.html b/ro/confirmation.html
index 02c06dd67d46f7d15b21e024c90685f683934aec..24693bf9293fb5c693712f990771fb3f0a3af128 100644 (file)
--- a/ro/confirmation.html
+++ b/ro/confirmation.html
@@ -32,13 +32,13 @@
     <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
          class="share-logo" alt="[GNU Social]" />
     &nbsp;GNU Social</a>&nbsp; |&nbsp;
-  <a href="http://microca.st/fsf">
-    <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-         class="share-logo" alt="[Pump.io]" />
-    &nbsp;Pump.io</a>&nbsp; |&nbsp;
+  <a href="https://hostux.social/@fsf">
+    <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+         class="share-logo" alt="[Mastodon]" />
+    &nbsp;Mastodon</a>&nbsp; |&nbsp;
   <a href="https://www.twitter.com/fsf">Twitter</a>
 </p>
-<p><small><a href="https://www.fsf.org/twitter">Citiți de ce GNU Social și Pump.io sunt mai bune decât Twitter.</a></small></p>
+<p><small><a href="https://www.fsf.org/twitter">Citiți de ce GNU Social și Mastodon sunt mai bune decât Twitter.</a></small></p>
 <hr />
                                        <p class="back" style="font-size:150%">&larr; Reveniți la <a href="index.html">Protejarea corespondenței electronice</a></p>
                        </div>

diff --git a/ro/index.html b/ro/index.html
index 2454c90cd7bd95c1457d50c299e2df07eb1e612c..11a99babbb376e35f7daacad0e022868cb8be3c2 100644 (file)
--- a/ro/index.html
+++ b/ro/index.html
@@ -59,8 +59,8 @@
                               <a href="https://fsf.org/share?u=https://u.fsf.org/zb&amp;t=Criptarea scrisorilor electronice pentru toți prin %40fsf">
                                 Distribuiți&nbsp;<img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
                                      class="share-logo" alt="[GNU Social]" />&nbsp;
-                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-                                      class="share-logo" alt="[Pump.io]" />&nbsp;
+                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+                                      class="share-logo" alt="[Mastodon]" />&nbsp;
                                  <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
                                       class="share-logo" alt="[Reddit]" />&nbsp;
                                  <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"

diff --git a/ro/mac.html b/ro/mac.html
index 3ec788383f7260851fb54d0c58fc11661f47d942..8ec109d676f6c9dfad32b85eae188627bdb7ef7e 100644 (file)
--- a/ro/mac.html
+++ b/ro/mac.html
@@ -59,8 +59,8 @@
                               <a href="https://fsf.org/share?u=https://u.fsf.org/zb&amp;t=Criptarea scrisorilor electronice pentru toți prin %40fsf">
                                 Distribuiți&nbsp;<img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
                                      class="share-logo" alt="[GNU Social]" />&nbsp;
-                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-                                      class="share-logo" alt="[Pump.io]" />&nbsp;
+                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+                                      class="share-logo" alt="[Mastodon]" />&nbsp;
                                  <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
                                       class="share-logo" alt="[Reddit]" />&nbsp;
                                  <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"

diff --git a/ro/next_steps.html b/ro/next_steps.html
index 4b3a077c9f6da0b19716d6270b6f6006d94ddabe..6f3a0f10635a636bd0d0f8c2deb653a929c1a18d 100644 (file)
--- a/ro/next_steps.html
+++ b/ro/next_steps.html
@@ -50,13 +50,13 @@
     <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
          class="share-logo" alt="[GNU Social]" />
     &nbsp;GNU Social</a>&nbsp; |&nbsp;
-  <a href="http://microca.st/fsf">
-    <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-         class="share-logo" alt="[Pump.io]" />
-    &nbsp;Pump.io</a>&nbsp; |&nbsp;
+  <a href="https://hostux.social/@fsf">
+    <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+         class="share-logo" alt="[Mastodon]" />
+    &nbsp;Mastodon</a>&nbsp; |&nbsp;
   <a href="https://www.twitter.com/fsf">Twitter</a>
 </p>
-<p><a href="https://www.fsf.org/twitter"><small>Citiți de ce GNU Social și Pump.io sunt mai bune decât Twitter.</small></a></p>
+<p><a href="https://www.fsf.org/twitter"><small>Citiți de ce GNU Social și Mastodon sunt mai bune decât Twitter.</small></a></p>
 <br />
 <div class="newsletter">
 <p style="font-size:150%">Listă de discuții cu volum scăzut</p>

diff --git a/ro/windows.html b/ro/windows.html
index 1885fe0a9961e3679902b4c904707130372a1d5a..8542a7e6af6795f0aeebdeeb90db35e7155b7841 100644 (file)
--- a/ro/windows.html
+++ b/ro/windows.html
@@ -59,8 +59,8 @@
                               <a href="https://fsf.org/share?u=https://u.fsf.org/zb&amp;t=Criptarea scrisorilor electronice pentru toți prin %40fsf">
                                 Distribuiți&nbsp;<img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
                                      class="share-logo" alt="[GNU Social]" />&nbsp;
-                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-                                      class="share-logo" alt="[Pump.io]" />&nbsp;
+                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+                                      class="share-logo" alt="[Mastodon]" />&nbsp;
                                  <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
                                       class="share-logo" alt="[Reddit]" />&nbsp;
                                  <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"

diff --git a/ru/confirmation.html b/ru/confirmation.html
index c7c2577ca6e456157649b472b32bf71bff2ffd5e..e62ab24903152b4f3475c2bb39286e9733e85cb5 100644 (file)
--- a/ru/confirmation.html
+++ b/ru/confirmation.html
@@ -42,15 +42,15 @@ info@fsf.org, и мы добавим Вас вручную.</p>
     <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
          class="share-logo" alt="[GNU Social]" />
     &nbsp;GNU Social</a>&nbsp; |&nbsp;
-  <a href="http://microca.st/fsf">
-    <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-         class="share-logo" alt="[Pump.io]" />
-    &nbsp;Pump.io</a>&nbsp; |&nbsp;
+  <a href="https://hostux.social/@fsf">
+    <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+         class="share-logo" alt="[Mastodon]" />
+    &nbsp;Mastodon</a>&nbsp; |&nbsp;
   <a href="https://www.twitter.com/fsf">Твиттер</a>
 </p>
 
 <p><small><a href="https://www.fsf.org/twitter">Узнайте, почему GNU
-Social и Pump.io лучше, чем Твиттер.</a></small></p>
+Social и Mastodon лучше, чем Твиттер.</a></small></p>
 
 <hr />
 

diff --git a/ru/index.html b/ru/index.html
index 42900e67f713923e6333755fb755596a3101f6ab..8941ddcba8de412a41ca28288e1da9f9a761abc9 100644 (file)
--- a/ru/index.html
+++ b/ru/index.html
@@ -59,8 +59,8 @@ href="https://fsf.org/share?u=https://u.fsf.org/zb&t=Шифрование э
 Поделиться 
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png" class="share-logo"

diff --git a/ru/infographic.html b/ru/infographic.html
index 53fcbc9656765766d73715fa42bac12c59705bdc..cc31e78a8d7541d20b1f7e0e23ad8017061ecb74 100644 (file)
--- a/ru/infographic.html
+++ b/ru/infographic.html
@@ -28,8 +28,8 @@
 href="https://fsf.org/share?u=https://u.fsf.org/zc&t=Как работает шифрование с открытым ключом. Графика на %40fsf">
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
      class="share-logo" alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-     class="share-logo" alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+     class="share-logo" alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
      class="share-logo" alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"

diff --git a/ru/kitchen/confirmation.t.html b/ru/kitchen/confirmation.t.html
index f46bacc9f260d633bfc17cf1951c5ea7bca581cb..ddaad41177a0b25c5e25013adf00d80d47643485 100644 (file)
--- a/ru/kitchen/confirmation.t.html
+++ b/ru/kitchen/confirmation.t.html
@@ -23,15 +23,15 @@ info@fsf.org, и мы добавим Вас вручную.</p>
     <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
          class="share-logo" alt="[GNU Social]" />
     &nbsp;GNU Social</a>&nbsp; |&nbsp;
-  <a href="http://microca.st/fsf">
-    <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-         class="share-logo" alt="[Pump.io]" />
-    &nbsp;Pump.io</a>&nbsp; |&nbsp;
+  <a href="https://hostux.social/@fsf">
+    <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+         class="share-logo" alt="[Mastodon]" />
+    &nbsp;Mastodon</a>&nbsp; |&nbsp;
   <a href="https://www.twitter.com/fsf">Твиттер</a>
 </p>
 
 <p><small><a href="https://www.fsf.org/twitter">Узнайте, почему GNU
-Social и Pump.io лучше, чем Твиттер.</a></small></p>
+Social и Mastodon лучше, чем Твиттер.</a></small></p>
 
 <hr />
 

diff --git a/ru/kitchen/index.t.html b/ru/kitchen/index.t.html
index 5715435d2017c0cdfd82e84034793cc03f8950c5..a84b62c9195db89ac762d1eeb9721a156b4e35a4 100644 (file)
--- a/ru/kitchen/index.t.html
+++ b/ru/kitchen/index.t.html
@@ -29,8 +29,8 @@ href="https://fsf.org/share?u=https://u.fsf.org/zb&t=Шифрование э
 Поделиться 
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png" class="share-logo"

diff --git a/ru/kitchen/infographic.t.html b/ru/kitchen/infographic.t.html
index c64b30afe5a1fb48f073a63e6fd488684673c3c9..00a2d60014f77b0b08581d88785a67999bfbf2ee 100644 (file)
--- a/ru/kitchen/infographic.t.html
+++ b/ru/kitchen/infographic.t.html
@@ -9,8 +9,8 @@
 href="https://fsf.org/share?u=https://u.fsf.org/zc&t=Как работает шифрование с открытым ключом. Графика на %40fsf">
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
      class="share-logo" alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-     class="share-logo" alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+     class="share-logo" alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
      class="share-logo" alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"

diff --git a/ru/kitchen/next_steps.t.html b/ru/kitchen/next_steps.t.html
index bbc502e9d748a1aea61a90cc1c155810cf8f4192..9686a40bcf732812c7e81043dd2de3bfc2e0a387 100644 (file)
--- a/ru/kitchen/next_steps.t.html
+++ b/ru/kitchen/next_steps.t.html
@@ -47,14 +47,14 @@ alt="Графика: смотри и обменивайся &rarr;" /></a></p>
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo" alt="[GNU Social]" />
 &nbsp;GNU Social</a>&nbsp; |&nbsp;
-<a href="http://microca.st/fsf">
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-class="share-logo" alt="[Pump.io]" />
-&nbsp;Pump.io</a>&nbsp; |&nbsp;
+<a href="https://hostux.social/@fsf">
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+class="share-logo" alt="[Mastodon]" />
+&nbsp;Mastodon</a>&nbsp; |&nbsp;
 <a href="https://www.twitter.com/fsf">Твиттер</a>
 </p>
 <p><small>Узнайте, <a href="//www.fsf.org/twitter">почему GNU
-Social и Pump.io лучше, чем Твиттер</a>, и <a
+Social и Mastodon лучше, чем Твиттер</a>, и <a
 href="//www.fsf.org/facebook"> почему мы не пользуемся
 Facebook</a></small></p>
 

diff --git a/ru/kitchen/workshops.t.html b/ru/kitchen/workshops.t.html
index 7a1c4bffbf33a325efcaa32b89daf56ac2f1cb4b..3b2e8cc87e6a2c49e6fb1fccefd290689e5d1097 100644 (file)
--- a/ru/kitchen/workshops.t.html
+++ b/ru/kitchen/workshops.t.html
@@ -23,8 +23,8 @@ href="https://fsf.org/share?u=https://u.fsf.org/zb&t=Шифрование э
 Поделиться 
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png" class="share-logo"

diff --git a/ru/mac.html b/ru/mac.html
index c711ba1875aae9c2ec8e5b72c3371b00112ef928..d9f6181322045f9086452577643768a01e673cc8 100644 (file)
--- a/ru/mac.html
+++ b/ru/mac.html
@@ -59,8 +59,8 @@ href="https://fsf.org/share?u=https://u.fsf.org/zb&t=Шифрование э
 Поделиться 
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png" class="share-logo"

diff --git a/ru/next_steps.html b/ru/next_steps.html
index 1c89d98a0bc47aa324a3444edf9826b4a75fdbdf..b66502646ff49005af6fabab650c0759444fb38b 100644 (file)
--- a/ru/next_steps.html
+++ b/ru/next_steps.html
@@ -66,14 +66,14 @@ alt="Графика: смотри и обменивайся &rarr;" /></a></p>
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo" alt="[GNU Social]" />
 &nbsp;GNU Social</a>&nbsp; |&nbsp;
-<a href="http://microca.st/fsf">
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-class="share-logo" alt="[Pump.io]" />
-&nbsp;Pump.io</a>&nbsp; |&nbsp;
+<a href="https://hostux.social/@fsf">
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
+class="share-logo" alt="[Mastodon]" />
+&nbsp;Mastodon</a>&nbsp; |&nbsp;
 <a href="https://www.twitter.com/fsf">Твиттер</a>
 </p>
 <p><small>Узнайте, <a href="//www.fsf.org/twitter">почему GNU
-Social и Pump.io лучше, чем Твиттер</a>, и <a
+Social и Mastodon лучше, чем Твиттер</a>, и <a
 href="//www.fsf.org/facebook"> почему мы не пользуемся
 Facebook</a></small></p>
 

diff --git a/ru/windows.html b/ru/windows.html
index 0b07d90250e77e2d7ffafa13907b10a07e6669f8..5f74ce81d6ff541809dfdf42051232a21357cd10 100644 (file)
--- a/ru/windows.html
+++ b/ru/windows.html
@@ -59,8 +59,8 @@ href="https://fsf.org/share?u=https://u.fsf.org/zb&t=Шифрование э
 Поделиться 
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png" class="share-logo"

diff --git a/ru/workshops.html b/ru/workshops.html
index 730d1059512237b20dc15eac6a9c754fd6bda444..924768776e9e9e5ec11d3c784c28e618a03442c9 100644 (file)
--- a/ru/workshops.html
+++ b/ru/workshops.html
@@ -63,8 +63,8 @@ href="https://fsf.org/share?u=https://u.fsf.org/zb&t=Шифрование э
 Поделиться 
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png" class="share-logo"

diff --git a/sq/confirmation.html b/sq/confirmation.html
index 133f5192db571309acc8f6214b7b64d299fd2e8f..2b87ec4c17f47b294ead0e6fbe2610d782fca957 100644 (file)
--- a/sq/confirmation.html
+++ b/sq/confirmation.html
@@ -34,14 +34,14 @@ alt="Provojeni." /></p><br />
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" />
-&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="http://microca.st/fsf"><img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="https://hostux.social/@fsf"><img
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />
-&nbsp;Pump.io</a>&nbsp; |&nbsp; <a href="https://www.twitter.com/fsf">Twitter</a></p>
+alt="[Mastodon]" />
+&nbsp;Mastodon</a>&nbsp; |&nbsp; <a href="https://www.twitter.com/fsf">Twitter</a></p>
 
 <p><small><a href="https://www.fsf.org/twitter">Lexoni pse GNU Social dhe
-Pump.io janë më mirë se Twitter.</a></small></p>
+Mastodon janë më mirë se Twitter.</a></small></p>
 
 <hr />
 

diff --git a/sq/index.html b/sq/index.html
index 6906d55cc7a73eb966f7eac7d10dc48dd5f95353..5295db6a5b0cb4966ee8e0e863b511762c2c9640 100644 (file)
--- a/sq/index.html
+++ b/sq/index.html
@@ -57,9 +57,9 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"

diff --git a/sq/infographic.html b/sq/infographic.html
index 9191bca892cd9859fd7dd08ddc34039905d0869c..ba3a156524c407f58af38e0935e061e6af3ea608 100644 (file)
--- a/sq/infographic.html
+++ b/sq/infographic.html
@@ -25,9 +25,9 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"

diff --git a/sq/mac.html b/sq/mac.html
index 829f432fa0a44f63aa5349a3b176532d8bc355c1..6e468379cd461631f59736a7a646a0816a34f060 100644 (file)
--- a/sq/mac.html
+++ b/sq/mac.html
@@ -57,9 +57,9 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"

diff --git a/sq/next_steps.html b/sq/next_steps.html
index a81c4c399b2f709762841fa3135a3425acf039a3..e8c78476c3c2f415ccca4d32876038d1797153b3 100644 (file)
--- a/sq/next_steps.html
+++ b/sq/next_steps.html
@@ -63,14 +63,14 @@ mendojnë gjërat po si ju dhe të punoni tok për ndryshime.</p>
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" />
-&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="http://microca.st/fsf"><img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="https://hostux.social/@fsf"><img
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />
-&nbsp;Pump.io</a>&nbsp; |&nbsp; <a href="https://www.twitter.com/fsf">Twitter</a></p>
+alt="[Mastodon]" />
+&nbsp;Mastodon</a>&nbsp; |&nbsp; <a href="https://www.twitter.com/fsf">Twitter</a></p>
 
 <p><small>Lexoni <a href="https://www.fsf.org/twitter">pse GNU Social dhe
-Pump.io janë më të mirë se sa Twitter</a>, dhe <a
+Mastodon janë më të mirë se sa Twitter</a>, dhe <a
 href="http://www.fsf.org/facebook">pse ne nuk përdorim Facebook</a>.</small></p>
 
 <br />

diff --git a/sq/windows.html b/sq/windows.html
index f52e7d2c016ae0c90b120dbfc3ec531b0c50d904..b842af67917da2341bd73757f271044fe22782a9 100644 (file)
--- a/sq/windows.html
+++ b/sq/windows.html
@@ -57,9 +57,9 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"

diff --git a/sq/workshops.html b/sq/workshops.html
index 8825e08c07cceec9e5afb7496a82b3d1749903ac..da5b4306db1a0d549c071c9af7dc6b33d926e935 100644 (file)
--- a/sq/workshops.html
+++ b/sq/workshops.html
@@ -55,8 +55,8 @@ email-i për këdo, përmes %40fsf">Përhapeni 
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;

diff --git a/sv/confirmation.html b/sv/confirmation.html
index 77ba7f0c2fb5ea991b8c9b2ecdb05ee2b18e7a27..a16394e9cf31402d7e78bbd526ea6bf6a3c3d2ad 100644 (file)
--- a/sv/confirmation.html
+++ b/sv/confirmation.html
@@ -37,15 +37,15 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" />
 &nbsp;GNU Social</a>&nbsp; |&nbsp;
-<a href="http://microca.st/fsf"><img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+<a href="https://hostux.social/@fsf"><img
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />
-&nbsp;Pump.io</a>&nbsp; |&nbsp;
+alt="[Mastodon]" />
+&nbsp;Mastodon</a>&nbsp; |&nbsp;
 <a href="https://www.twitter.com/fsf">Twitter</a></p>
 
 <p><small><a href="https://www.fsf.org/twitter">Läs om varför GNU Social
-och Pump.io är bättre än Twitter.</a></small></p>
+och Mastodon är bättre än Twitter.</a></small></p>
 
 <hr />
 

diff --git a/sv/index.html b/sv/index.html
index 8e285f003553a255dd7a2ece5a8ce3e07527c32a..2f5ec019ce3cc295f41aa31c36b181c2b4ede2e6 100644 (file)
--- a/sv/index.html
+++ b/sv/index.html
@@ -60,9 +60,9 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"

diff --git a/sv/infographic.html b/sv/infographic.html
index 2358c584a24d76df6343a4bc83cade0665e5e03b..7db15dc534f9c558841007f2a2eb4961f49e0d0e 100644 (file)
--- a/sv/infographic.html
+++ b/sv/infographic.html
@@ -27,9 +27,9 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"

diff --git a/sv/kitchen/confirmation.t.html b/sv/kitchen/confirmation.t.html
index 833a0ca5ff9aac5ac0aa2a3a394fc66a1d301f12..7281bf8e4df43bdb6f21d596d5bbca3b5c210137 100644 (file)
--- a/sv/kitchen/confirmation.t.html
+++ b/sv/kitchen/confirmation.t.html
@@ -20,12 +20,12 @@ alt="Try it out." /></p>
 <p style="font-size:150%"> <a href="https://status.fsf.org/fsf"> <img
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]">
-&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="http://microca.st/fsf"> <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]">
-&nbsp;Pump.io</a>&nbsp; |&nbsp; <a href="https://www.twitter.com/fsf">Twitter</a> </p>
+&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="https://hostux.social/@fsf"> <img
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]">
+&nbsp;Mastodon</a>&nbsp; |&nbsp; <a href="https://www.twitter.com/fsf">Twitter</a> </p>
 
-<p><small><a href="https://www.fsf.org/twitter">Read why GNU Social and Pump.io are better
+<p><small><a href="https://www.fsf.org/twitter">Read why GNU Social and Mastodon are better
 than Twitter.</a></small></p>
 
 <hr />

diff --git a/sv/kitchen/infographic.t.html b/sv/kitchen/infographic.t.html
index 16574fe93f522f49c606ba2b29aab86b9811193d..47b9a379edd2667a6a7dd7a33d88184b18bbf96a 100644 (file)
--- a/sv/kitchen/infographic.t.html
+++ b/sv/kitchen/infographic.t.html
@@ -6,9 +6,9 @@
 
 <h3> <a href="https://fsf.org/share?u=https://u.fsf.org/zc&amp;t=How&nbsp;public-key encryption works. Infographic via %40fsf"> <img
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
-alt="[GNU Social]">&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+alt="[GNU Social]">&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]">&nbsp;
+alt="[Mastodon]">&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]">&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"
 class="share-logo"

diff --git a/sv/mac.html b/sv/mac.html
index 71ab51063e4b83847571f09fc4e61d252bc5f1da..a6db5904fa92b88fadf7a5f552f520fe36efedf0 100644 (file)
--- a/sv/mac.html
+++ b/sv/mac.html
@@ -60,9 +60,9 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"

diff --git a/sv/next_steps.html b/sv/next_steps.html
index 4421bb32af829ae23c5be23b28526cc0ec84318c..5bbbae5dfb0ee4caf04d362a507be23c23541dfb 100644 (file)
--- a/sv/next_steps.html
+++ b/sv/next_steps.html
@@ -63,15 +63,15 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" />
 &nbsp;GNU Social</a>&nbsp; |&nbsp;
-<a href="http://microca.st/fsf"><img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+<a href="https://hostux.social/@fsf"><img
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />
-&nbsp;Pump.io</a>&nbsp; |&nbsp;
+alt="[Mastodon]" />
+&nbsp;Mastodon</a>&nbsp; |&nbsp;
 <a href="https://www.twitter.com/fsf">Twitter</a></p>
 
 <p><small>Läs <a href="https://www.fsf.org/twitter">om varför
-GNU Social och Pump.io är bättre än Twitter</a>, och <a
+GNU Social och Mastodon är bättre än Twitter</a>, och <a
 href="http://www.fsf.org/facebook">varför vi inte använder
 Facebook</a>.</small></p>
 

diff --git a/sv/windows.html b/sv/windows.html
index ca04ae21fa847e6f14dc36cb409e6ea38d5a4294..5c6d285331ee8961a9b98fe5c98cb9ef29818457 100644 (file)
--- a/sv/windows.html
+++ b/sv/windows.html
@@ -60,9 +60,9 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"

diff --git a/sv/workshops.html b/sv/workshops.html
index 38d3f70b6a6e66ac1a95071d09fd6dd26dbc62a9..a3892661d099ae9713fe24d9f1ce0e279720149a 100644 (file)
--- a/sv/workshops.html
+++ b/sv/workshops.html
@@ -59,8 +59,8 @@ för alla via %40fsf">Dela 
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;

diff --git a/tr/confirmation.html b/tr/confirmation.html
index 15ca33a4a0fa2acfc53036f5b9b7ff8039bfe855..f3eaeb4b2566e66cad1b7f240cc5db345a357776 100644 (file)
--- a/tr/confirmation.html
+++ b/tr/confirmation.html
@@ -35,14 +35,14 @@ alt="Deneyin." /></p><br />
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" />
-&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="http://microca.st/fsf"><img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="https://hostux.social/@fsf"><img
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />
-&nbsp;Pump.io</a>&nbsp; |&nbsp; <a
+alt="[Mastodon]" />
+&nbsp;Mastodon</a>&nbsp; |&nbsp; <a
 href="https://www.twitter.com/fsf">Twitter</a></p>
 
-<p><small><a href="https://www.fsf.org/twitter">GNU Social ve Pump.io'nun neden
+<p><small><a href="https://www.fsf.org/twitter">GNU Social ve Mastodon'nun neden
 Twitter'dan daha iyi olduğunu okuyun.</a></small></p>
 
 <hr />

diff --git a/tr/index.html b/tr/index.html
index 7e1dd2b15cd3fa0c428e25aa3516aabf0fc2207a..5c56fc664ddf927da3fe0d45bc453bc0b5cd6549 100644 (file)
--- a/tr/index.html
+++ b/tr/index.html
@@ -56,8 +56,8 @@ href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
 for everyone via %40fsf"> Paylaşın 
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png" class="share-logo"

diff --git a/tr/infographic.html b/tr/infographic.html
index 37ceee394059433d2e0c8c8091f35e5b6d16d931..c4197182bcbc0826beacc3b67e3e6200e07121fc 100644 (file)
--- a/tr/infographic.html
+++ b/tr/infographic.html
@@ -26,9 +26,9 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"

diff --git a/tr/mac.html b/tr/mac.html
index a377486d88c0ce9581b03435b64b77992dc33760..1c3f8b67dd0fd51d78c5662959cb9284f7fd1fdb 100644 (file)
--- a/tr/mac.html
+++ b/tr/mac.html
@@ -56,8 +56,8 @@ href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
 for everyone via %40fsf"> Paylaşın 
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png" class="share-logo"

diff --git a/tr/next_steps.html b/tr/next_steps.html
index a1d4cdea50ab554e53bac2e64571f3778863a4d1..37da33607ca50d0542b2ec2cdcdc4c3c33d4f69b 100644 (file)
--- a/tr/next_steps.html
+++ b/tr/next_steps.html
@@ -66,14 +66,14 @@ birlikte çabalamak üzere Özgür Yazılım Vakfı'nın topluluğuna katılın.
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" />
-&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="http://microca.st/fsf"><img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="https://hostux.social/@fsf"><img
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />
-&nbsp;Pump.io</a>&nbsp; |&nbsp; <a
+alt="[Mastodon]" />
+&nbsp;Mastodon</a>&nbsp; |&nbsp; <a
 href="https://www.twitter.com/fsf">Twitter</a></p>
 
-<p><small><a href="https://www.fsf.org/twitter">GNU Social ve Pump.io'nun neden
+<p><small><a href="https://www.fsf.org/twitter">GNU Social ve Mastodon'nun neden
 Twitter'dan daha iyi olduğunu okuyun.</a></small></p>
 
 <br />

diff --git a/tr/windows.html b/tr/windows.html
index 63ba651655ab9d3eaf90fa107162c252c077b96e..d8614ee6ec3b2b3bc7d742474c689ab04c656f0d 100644 (file)
--- a/tr/windows.html
+++ b/tr/windows.html
@@ -56,8 +56,8 @@ href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
 for everyone via %40fsf"> Paylaşın 
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png" class="share-logo"

diff --git a/tr/workshops.html b/tr/workshops.html
index 0f8d3f11afbc2044e471aecd4d49cc743a4243c0..d01341b3143d4f5390f2edc3b04ad22989dcc836 100644 (file)
--- a/tr/workshops.html
+++ b/tr/workshops.html
@@ -58,8 +58,8 @@ for everyone via %40fsf">PAYLAŞ 
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;

diff --git a/zh-hans/confirmation.html b/zh-hans/confirmation.html
index 54e15e93629d7435639c8d742c7cd3f1cb6d5650..c7e44d788dbe3f82b0b93c7fd5675f7c28cdb64f 100644 (file)
--- a/zh-hans/confirmation.html
+++ b/zh-hans/confirmation.html
@@ -32,14 +32,14 @@ alt="来试试" /></p><br />
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" />
-&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="http://microca.st/fsf"><img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="https://hostux.social/@fsf"><img
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />
-&nbsp;Pump.io</a>&nbsp; |&nbsp; <a
+alt="[Mastodon]" />
+&nbsp;Mastodon</a>&nbsp; |&nbsp; <a
 href="https://www.twitter.com/fsf">Twitter</a></p>
 
-<p><small><a href="https://www.fsf.org/twitter">阅读为什么 GNU Social 和 Pump.io 要比
+<p><small><a href="https://www.fsf.org/twitter">阅读为什么 GNU Social 和 Mastodon 要比
 Twitter 好。</a></small></p>
 
 <hr />

diff --git a/zh-hans/index.html b/zh-hans/index.html
index 49aa7f9915beb7cd9d174d5c13d9b2de853f7dfd..85ed3095c4c1354ffa0e245e34c3c468db26379f 100644 (file)
--- a/zh-hans/index.html
+++ b/zh-hans/index.html
@@ -55,8 +55,8 @@ href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
 for everyone via %40fsf">分享 
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png" class="share-logo"

diff --git a/zh-hans/infographic.html b/zh-hans/infographic.html
index 1c098b11f168cba42f842f256e38ddf2e04fabc4..cb2ae50428cc528b31ac652288f7f6c377b09d7a 100644 (file)
--- a/zh-hans/infographic.html
+++ b/zh-hans/infographic.html
@@ -25,9 +25,9 @@ src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" /> 
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />&nbsp;
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
 class="share-logo"

diff --git a/zh-hans/kitchen/confirmation.t.html b/zh-hans/kitchen/confirmation.t.html
index 83da58f8f8a49cb8a3fbaf16d9de068eaa7a06af..56a9475783731e4a8b112d9d521675cbd86c33db 100644 (file)
--- a/zh-hans/kitchen/confirmation.t.html
+++ b/zh-hans/kitchen/confirmation.t.html
@@ -20,12 +20,12 @@ alt="Try it out." /></p>
 <p style="font-size:150%"> <a href="https://status.fsf.org/fsf"> <img
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]">
-&nbsp;GNU Social </a> |&nbsp; <a href="http://microca.st/fsf"> <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]">
-&nbsp;Pump.io </a> |&nbsp; <a href="https://www.twitter.com/fsf">Twitter</a> </p>
+&nbsp;GNU Social </a> |&nbsp; <a href="https://hostux.social/@fsf"> <img
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]">
+&nbsp;Mastodon </a> |&nbsp; <a href="https://www.twitter.com/fsf">Twitter</a> </p>
 
-<p><small><a href="https://www.fsf.org/twitter">Read why GNU Social and Pump.io are better
+<p><small><a href="https://www.fsf.org/twitter">Read why GNU Social and Mastodon are better
 than Twitter.</a></small></p>
 
 <hr />

diff --git a/zh-hans/kitchen/infographic.t.html b/zh-hans/kitchen/infographic.t.html
index 16574fe93f522f49c606ba2b29aab86b9811193d..47b9a379edd2667a6a7dd7a33d88184b18bbf96a 100644 (file)
--- a/zh-hans/kitchen/infographic.t.html
+++ b/zh-hans/kitchen/infographic.t.html
@@ -6,9 +6,9 @@
 
 <h3> <a href="https://fsf.org/share?u=https://u.fsf.org/zc&amp;t=How&nbsp;public-key encryption works. Infographic via %40fsf"> <img
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
-alt="[GNU Social]">&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+alt="[GNU Social]">&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]">&nbsp;
+alt="[Mastodon]">&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]">&nbsp; <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"
 class="share-logo"

diff --git a/zh-hans/mac.html b/zh-hans/mac.html
index a8b243d00133056628bd32d84bfe5a1fe02ac2ba..98bf5bae77f30e715d467ad880c7f48f1b635069 100644 (file)
--- a/zh-hans/mac.html
+++ b/zh-hans/mac.html
@@ -55,8 +55,8 @@ href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
 for everyone via %40fsf">分享 
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png" class="share-logo"

diff --git a/zh-hans/next_steps.html b/zh-hans/next_steps.html
index 5359b9688c475911edbf97c357a3d9f2cb1169e0..887a7de7c0847be31cf3d2a47c01b3c00dc43f71 100644 (file)
--- a/zh-hans/next_steps.html
+++ b/zh-hans/next_steps.html
@@ -59,14 +59,14 @@ alt="查看并分享我们的信息图" /></a></p>
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
 class="share-logo"
 alt="[GNU Social]" />
-&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="http://microca.st/fsf"><img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="https://hostux.social/@fsf"><img
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png"
 class="share-logo"
-alt="[Pump.io]" />
-&nbsp;Pump.io</a>&nbsp; |&nbsp; <a
+alt="[Mastodon]" />
+&nbsp;Mastodon</a>&nbsp; |&nbsp; <a
 href="https://www.twitter.com/fsf">Twitter</a></p>
 
-<p><small>阅读 <a href="https://www.fsf.org/twitter">为什么  GNU Social 和 Pump.io
+<p><small>阅读 <a href="https://www.fsf.org/twitter">为什么  GNU Social 和 Mastodon
 要胜于 Twitter（英文）</a>，以及 <a href="http://www.fsf.org/facebook">为什么我们不使用
 Facebook（英文）</a>。</small></p>
 

diff --git a/zh-hans/windows.html b/zh-hans/windows.html
index a76ab746983333eb690231854381731fee8671eb..5debc219d12a98a36bbc81ef84429c6e3b624712 100644 (file)
--- a/zh-hans/windows.html
+++ b/zh-hans/windows.html
@@ -55,8 +55,8 @@ href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
 for everyone via %40fsf">分享 
 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
-<img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+<img src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;
 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png" class="share-logo"

diff --git a/zh-hans/workshops.html b/zh-hans/workshops.html
index f1c32470b9cb1c72684826c8a6310235daea4a7a..3776b12bf2d79fcd12d29fa183cf20c6b85e60c8 100644 (file)
--- a/zh-hans/workshops.html
+++ b/zh-hans/workshops.html
@@ -2,7 +2,7 @@
 <html lang="zh-Hans">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<title>电子邮件加密指南 - 研讨会</title>
+<title>电子邮件加密指南 - 使用 GnuPG 加密对抗大规模监控</title>
 <meta name="keywords" content="GnuPG, GPG, openpgp, 监控, 隐私, 电子邮件, Enigmail" />
 <meta name="description" content="电子邮件监控侵犯了我们的基本权利，并危及了言论自由。本指南将在四十分钟里，教会你使用 GnuPG 进行电子邮件加密。" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -57,8 +57,8 @@ for everyone via %40fsf">分享&nbsp;
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
 alt="[GNU Social]" />&nbsp;
 <img
-src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
-alt="[Pump.io]" />&nbsp;
+src="//static.fsf.org/nosvn/enc-dev0/img/mastodon.png" class="share-logo"
+alt="[Mastodon]" />&nbsp;
 <img
 src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png" class="share-logo"
 alt="[Reddit]" />&nbsp;