All transl: Pump.io > Mastodon (enc ef8311c); standardize title & keywords (7d36a41).

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 5c09875ca66c9900d8e45a8159add0d2458d2d94..2b17828fb7d3117d98621900f73a94d0960deaf2 100644 (file)
--- a/cs/index.html
+++ b/cs/index.html
@@ -53,8 +53,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 a9760634a4771099abc28a4025a3070c89069a8f..c0aa26b21edf688bf5282a7331711dc21745042f 100644 (file)
--- a/cs/mac.html
+++ b/cs/mac.html
@@ -53,8 +53,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 39c31d8a4239fc2bc682e578052e0abae2a93f04..696a25b9aff3db1d47ec775b99139ccd0cc665f2 100644 (file)
--- a/cs/windows.html
+++ b/cs/windows.html
@@ -53,8 +53,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 b0b49fb11d259e2042576d1f6df5bd9f7936302e..055a97252b1f0a6444e1c652b88bba8fac18ae19 100644 (file)
--- a/cs/workshops.html
+++ b/cs/workshops.html
@@ -2,7 +2,7 @@
 <html lang="cs">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<title>Emailová sebeobrana – poučte své známé!</title>
+<title>Emailová sebeobrana - příručka pro boj proti špehování s šifrováním GnuPG</title>
 <meta name="keywords" content="GnuPG, GPG, openpgp, špehování, soukromí, email, Enigmail" />
 <meta name="description" content="Špehování emailu porušuje naše základní práva a ohrožuje svobodu
 projevu. Tato příručka vás za 40 minut naučí emailové sebeobraně s GnuPG." />
@@ -55,8 +55,8 @@ for everyone via %40fsf">Sdílejte&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/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 87be674d5c75a69b93410a6341846f27d3efb372..223bba76c99c5f0f8f450d21adb82a9ca33674bc 100644 (file)
--- a/de/index.html
+++ b/de/index.html
@@ -56,8 +56,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/mac.html b/de/mac.html
index e2b6fbf09f03295c79aac677dda75c9f03ed50b7..bcbec8dce83256d3d7cb2ddc294f2ddc1ad96a15 100644 (file)
--- a/de/mac.html
+++ b/de/mac.html
@@ -56,8 +56,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 602bf33aa2eb4896763c8574a89e36baf8a4cd23..d1b27e409f8b73a736c4f3b3c914ac9fb03c3273 100644 (file)
--- a/de/windows.html
+++ b/de/windows.html
@@ -56,8 +56,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 d992a9feb5788a9158d06da836ac0399bc9c8891..3022006bf14325c8acfc18adae0c3da6e8d437b2 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
@@ -57,8 +58,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..dd4424b3f0ed9610a5c0625fbb745259f4c2591a 100644 (file)
--- a/el/confirmation.html
+++ b/el/confirmation.html
@@ -4,7 +4,7 @@
                        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 
                        <title>ΑΥΤΟΑΜΥΝΑ ΜΕ EMAIL - ένας οδηγός ενάντια στην παρακολούθηση με κρυποτγράφηση GnuPG</title>
-                       <meta name="keywords" content="GnuPG, GPG, ιδιωτικότητα, email, Enigmail" />
+                       <meta name="keywords" content="GnuPG, GPG, openpgp, παρακολούθηση, ιδιωτικότητα, email, Enigmail" />
       <meta name="description" content="Η μαζική παρακολούθηση δεδομένων παραβιάζει τα θεμελιώδη δικαιώματά μας και καθιστά την ελεύθερη έκφραση ριψοκίνδυνη.Αυτός ο οδηγός θα σε διδάξει αυτοάμυνα με email μέσα σε 30 λεπτά, χρησιμοποιώντας το GnuPG." />
 
       <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -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 c78746fbb1e3911f628d180ff9aeb40911de4f3c..144cba1f42e54917eca439ba5ea9d93d595798f5 100644 (file)
--- a/el/index.html
+++ b/el/index.html
@@ -56,8 +56,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/infographic.html b/el/infographic.html
index 8c2c9b59853e4706a68a5d279b8a5831a5762b3c..d13f04c358736d80c751949721a84880e6c51640 100644 (file)
--- a/el/infographic.html
+++ b/el/infographic.html
@@ -4,7 +4,7 @@
                        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 
                        <title>ΑΥΤΟΑΜΥΝΑ ΜΕ EMAIL - ένας οδηγός ενάντια στην παρακολούθηση με κρυποτγράφηση GnuPG</title>
-                       <meta name="keywords" content="GnuPG, GPG, ιδιωτικότητα, email, Enigmail" />
+                       <meta name="keywords" content="GnuPG, GPG, openpgp, παρακολούθηση, ιδιωτικότητα, email, Enigmail" />
       <meta name="description" content="Η μαζική παρακολούθηση δεδομένων παραβιάζει τα θεμελιώδη δικαιώματά μας και καθιστά την ελεύθερη έκφραση ριψοκίνδυνη.Αυτός ο οδηγός θα σε διδάξει αυτοάμυνα με email μέσα σε 30 λεπτά, χρησιμοποιώντας το GnuPG.">
 
       <meta name="viewport" content="width=device-width, initial-scale=1">

diff --git a/el/mac.html b/el/mac.html
index fb4e12848f73bbc4abec4893aee08bb76c577276..24a11480f9feae87829dd2682313f95be7c73c06 100644 (file)
--- a/el/mac.html
+++ b/el/mac.html
@@ -56,8 +56,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 8284aca7e853d1047b7261bf9fed6efe19bdcda4..2c75644b7e73a8d1fece299e3cf4ee562eef0cfa 100644 (file)
--- a/el/windows.html
+++ b/el/windows.html
@@ -56,8 +56,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 391a4b26a2de69b2bc577415f1200b1bc406ca95..00bfbabf01df100f4ae4b07a2be746c09c493530 100644 (file)
--- a/es/index.html
+++ b/es/index.html
@@ -55,8 +55,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 804cfbebf8343bde13ef8231ad0d2326a22c57bc..2c11a3737b70351a047d183808a6a4c8b58d0cad 100644 (file)
--- a/es/mac.html
+++ b/es/mac.html
@@ -55,8 +55,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 f2e86ad9898589734bca8eb11168a3af31dc4f6d..4c657cacb5ba2ce8eb9dcccc385edec2d059afa2 100644 (file)
--- a/es/windows.html
+++ b/es/windows.html
@@ -55,8 +55,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 aa0d1282bff6c83c34e10e4baaf8f1c4053c89a9..5ab92e364213df0038d5fed117989fc3c6637871 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
@@ -56,8 +57,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..edb44dbd1fdab9aa05b60ac162ece0eb5902225b 100644 (file)
--- a/fa/confirmation.html
+++ b/fa/confirmation.html
@@ -4,7 +4,7 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>محافظت از ایمیل - یک راهنما برای مبارزه با سیستم‌های نظارتی با رمز‌گذاری
 GnuPG</title>
-<meta name="keywords" content="GnuPG, GPG, حریم شخصی, ایمیل, Enigmail" />
+<meta name="keywords" content="GnuPG, GPG, openpgp, نظارت, حریم شخصی, ایمیل, Enigmail" />
 <meta name="description" content="نظارت گسترده حقوق اولیه ما را زیر پا می‌گذارد و آزادی بیان را پرمخاطره
 می‌سازد. این راهنما در مدت ۴۰ دقیقه محافظت از ایمیل شخصی به وسیله‌ی GnuPG را
 به شما آموزش می‌دهد." />
@@ -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 d67bb0abb65546ea08a977d26dd9b91bb79857c0..c55323b8c742a15fdf359ec1b85d1c1b5ec8478f 100644 (file)
--- a/fa/index.html
+++ b/fa/index.html
@@ -56,9 +56,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..1e307725813ed651879803b5ac530f0260282991 100644 (file)
--- a/fa/infographic.html
+++ b/fa/infographic.html
@@ -4,7 +4,7 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>محافظت از ایمیل - یک راهنما برای مبارزه با سیستم‌های نظارتی با رمز‌گذاری
 GnuPG</title>
-<meta name="keywords" content="GnuPG, GPG, حریم شخصی, ایمیل, Enigmail" />
+<meta name="keywords" content="GnuPG, GPG, openpgp, نظارت, حریم شخصی, ایمیل, Enigmail" />
 <meta name="description" content="نظارت گسترده حقوق اولیه ما را زیر پا می‌گذارد و آزادی بیان را پرمخاطره
 می‌سازد. این راهنما در مدت ۴۰ دقیقه محافظت از ایمیل شخصی به وسیله‌ی GnuPG را
 به شما آموزش می‌دهد." />
@@ -27,9 +27,9 @@ 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"
+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 ca082fb74988b8b5c984b4b3279750a2c7e23366..1b588fa157748b9bff601e19635995a966b3f9f5 100644 (file)
--- a/fa/mac.html
+++ b/fa/mac.html
@@ -56,9 +56,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 7f4aa3e492547ac2a7bccc0b0771eb2400ac4eb8..c73525462ce0b51d2c8ab58404275f41abdff3ce 100644 (file)
--- a/fa/windows.html
+++ b/fa/windows.html
@@ -56,9 +56,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 f6b1e035dae147c7acdf7a4dcf05120e8b710969..22d541a6cbc9e166e80945b431f5d4756af9bc2f 100644 (file)
--- a/fa/workshops.html
+++ b/fa/workshops.html
@@ -2,7 +2,8 @@
 <html lang="fa" dir="rtl">
 <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 را
@@ -54,8 +55,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;

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 10296100e11f859f8b35018492e17e3f7af65e61..710498f49aaeca6033ba14843a8522a56c01f754 100644 (file)
--- a/fr/index.html
+++ b/fr/index.html
@@ -50,9 +50,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/mac.html b/fr/mac.html
index 3381cb0b82ffc4d3e9b53bf519b45e21f23e9ac2..66ed271205ff427a7fe3c094b4b8d06166c0258a 100644 (file)
--- a/fr/mac.html
+++ b/fr/mac.html
@@ -50,9 +50,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 55b5a6e7dbd78f91654798e456d7ced0523b8083..10df78451f8fb68a933b58409abc92aae9396028 100644 (file)
--- a/fr/windows.html
+++ b/fr/windows.html
@@ -50,9 +50,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 6eadf4fa4878be3a893ad0a749ee00e281033c8f..cd9cbd847885f9b1d85d89db07bccd165ccfe65d 100644 (file)
--- a/fr/workshops.html
+++ b/fr/workshops.html
@@ -4,7 +4,8 @@
 <html lang="fr" xml:lang="fr">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<title>Autodéfense courriel - Initiez vos amis !</title>
+<title>Autodéfense courriel - un guide pour contrer la surveillance en chiffrant avec
+GnuPG</title>
 <meta name="keywords" content="GnuPG, GPG, openpgp, surveillance, vie privée,
 confidentialité, courriel, Enigmail" />
 <meta name="description" content="La surveillance du courriel viole nos droits fondamentaux et fait planer un risque sur la liberté d'expression. En 40&nbsp;minutes, ce guide vous apprendra à vous défendre avec GnuPG." />
@@ -51,9 +52,9 @@ confidentialité, courriel, Enigmail" />
 href="https://fsf.org/share?u=https://u.fsf.org/zb&amp;t=Chiffrement&nbsp;du&nbsp;courriel&nbsp;pour&nbsp;tous&nbsp;avec&nbsp;%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..7654c401d9409acc5551fdd6683beb938a1184b1 100644 (file)
--- a/it/confirmation.html
+++ b/it/confirmation.html
@@ -4,7 +4,7 @@
                        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 
                        <title>Autodifesa Email - una guida per combattere la sorveglianza di massa con la criptazione di GnuPG</title>
-                       <meta name="keywords" content="GnuPG, GPG, privacy, email, Enigmail" />
+                       <meta name="keywords" content="GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail" />
       <meta name="description" content="Email surveillance violates our fundamental rights and makes free speech risky. This guide will teach you email self-defense in 30 minutes with GnuPG." />
 
       <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -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 bbfd633b0764c76364b2b0a0d74f55850ac102e7..b274d5b5592142675b253c94a57a5f4daad107af 100644 (file)
--- a/it/index.html
+++ b/it/index.html
@@ -56,8 +56,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/infographic.html b/it/infographic.html
index 696e1c2a92975f01922799a1c1fbe278761d3242..cf1ec5f2e9c545bcd243f811b82600d361ceaa89 100644 (file)
--- a/it/infographic.html
+++ b/it/infographic.html
@@ -4,7 +4,7 @@
                        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 
                        <title>Autodifesa Email - una guida per combattere la sorveglianza di massa con la criptazione di GnuPG</title>
-                       <meta name="keywords" content="GnuPG, GPG, privacy, email, Enigmail" />
+                       <meta name="keywords" content="GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail" />
       <meta name="description" content="Email surveillance violates our fundamental rights and makes free speech risky. This guide will teach you email self-defense in 30 minutes with GnuPG." />
 
       <meta name="viewport" content="width=device-width, initial-scale=1" />

diff --git a/it/mac.html b/it/mac.html
index 380a857c663d5234c1d804f3f476e35d5336a55b..c82f50c892a471a627e9dc9d1d9d5c97b8e9aede 100644 (file)
--- a/it/mac.html
+++ b/it/mac.html
@@ -55,8 +55,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 186792591a9d5f0629d3261de48f12a41ccc490d..50f7130ec28e0e35ebcf8284f66ff62025587c57 100644 (file)
--- a/it/windows.html
+++ b/it/windows.html
@@ -56,8 +56,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..e0e85cee59cad1543a69afbf719c117b6a9fb6d7 100644 (file)
--- a/ja/confirmation.html
+++ b/ja/confirmation.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>電子メール自衛 - 監視にGnuPGの暗号化で闘うガイド</title>
-<meta name="keywords" content="GnuPG, GPG, privacy, email, Enigmail" />
+<meta name="keywords" content="GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail" />
 <meta name="description" content="Email surveillance violates our fundamental rights and makes free speech
 risky. This guide will teach you email self-defense in 40 minutes with
 GnuPG." />
@@ -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 b00e3c92f666b836c18553c3b8c522cc40977586..d02999d7ff32e47ead982e270f13a570a8ea4b63 100644 (file)
--- a/ja/index.html
+++ b/ja/index.html
@@ -56,9 +56,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..3334c75a0b711f4ee6cc104a99fd197a8d423d39 100644 (file)
--- a/ja/infographic.html
+++ b/ja/infographic.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>電子メール自衛 - 監視にGnuPGの暗号化で闘うガイド</title>
-<meta name="keywords" content="GnuPG, GPG, privacy, email, Enigmail" />
+<meta name="keywords" content="GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail" />
 <meta name="description" content="Email surveillance violates our fundamental rights and makes free speech
 risky. This guide will teach you email self-defense in 40 minutes with
 GnuPG." />
@@ -25,9 +25,9 @@ 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"
+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 60276cfd328914b1e31678bca15f616f2e28701e..c626ede86d7ba23aaacc8d4d8891050235b62c3b 100644 (file)
--- a/ja/mac.html
+++ b/ja/mac.html
@@ -56,9 +56,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 a470d5514c5344a866030c6f0d444684cd19a0df..f10b03500f68023a58bbb70b040d585ddc8ec81c 100644 (file)
--- a/ja/windows.html
+++ b/ja/windows.html
@@ -56,9 +56,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 23de45fe5e4f48b028c5e98d3aa1a23b346fea0b..80edc17066ee63b4cee4cf750fe1f4e48b56fae6 100644 (file)
--- a/ja/workshops.html
+++ b/ja/workshops.html
@@ -2,7 +2,7 @@
 <html lang="ja">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<title>é\9b»å­\90ã\83¡ã\83¼ã\83«è\87ªè¡\9b - ç\9f¥ã\82\8aå\90\88ã\81\84ã\81«æ\95\99ã\81\88ã\82\88ã\81\86</title>
+<title>é\9b»å­\90ã\83¡ã\83¼ã\83«è\87ªè¡\9b - ç\9b£è¦\96ã\81«GnuPGã\81®æ\9a\97å\8f·å\8c\96ã\81§é\97\98ã\81\86ã\82¬ã\82¤ã\83\89</title>
 <meta name="keywords" content="GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail" />
 <meta name="description" content="Email surveillance violates our fundamental rights and makes free speech
 risky. This guide will teach you email self-defense in 40 minutes with
@@ -55,8 +55,8 @@ for everyone via %40fsf">共有
 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/ko/confirmation.html b/ko/confirmation.html
index f4dc4a5be93ace091d0d4c77ce84cd4034fff6bf..70c58406fac0afb65b8e7a5e06dcdcdb347926a7 100644 (file)
--- a/ko/confirmation.html
+++ b/ko/confirmation.html
@@ -4,7 +4,7 @@
                        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 
                        <title>스스로 이메일 보호하기 - GnuPG 암호화를 이용한 감시 방어 가이드</title>
-                       <meta name="keywords" content="GnuPG, GPG, 감시, 개인 정보, 이메일, Enigmail" />
+                       <meta name="keywords" content="GnuPG, GPG, openpgp, 감시, 개인 정보, 이메일, Enigmail" />
        <meta name="description" content="이메일 감시는 우리의 기본적인 권리를 침해하고 자유로운 발언을 할 권리를 위협합니다. 이 가이드는 30분 안에 GnuPG를 이용해 이메일을 스스로 보호하는 법에 대해 알려줍니다. " />
 
       <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -15,9 +15,7 @@
        <body>
 
 <h3 class="wip">Translation in Progress</h3>
-<p class="wip">Please contact <a
-href="mailto:esd-translators@fsf.org">&lt;esd-translators@fsf.org&gt;</a>
-if you want to help. Thanks!</p>
+<p class="wip">The <a href="/esd-ko.po">PO file</a> is where work is being done. Please help us if you can. Thanks!</p>
 
                <header class="row centered" id="header">
                        <div>
@@ -36,13 +34,13 @@ if you want to help. Thanks!</p>
     <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 a699ca4e709597956f8ec982640e766d80695432..f21da0a4691b8ee5f4ef00be640d7321854c9a22 100644 (file)
--- a/ko/index.html
+++ b/ko/index.html
@@ -15,9 +15,7 @@
        <body>
 
 <h3 class="wip">Translation in Progress</h3>
-<p class="wip">Please contact <a
-href="mailto:esd-translators@fsf.org">&lt;esd-translators@fsf.org&gt;</a>
-if you want to help. Thanks!</p>
+<p class="wip">The <a href="/esd-ko.po">PO file</a> is where work is being done. Please help us if you can. Thanks!</p>
 
 <!-- ~~~~~~~~~ GnuPG Header and introduction text  ~~~~~~~~~ -->
 
@@ -43,8 +41,7 @@ if you want to help. Thanks!</p>
 <li><a href="/sv">svenska - v4.0</a></li>
 <li><a href="/tr">Türkçe - v4.0</a></li>
 <li><a href="/zh-hans">简体中文 - v4.0</a></li>
-<li><a href="https://libreplanet.org/wiki/GPG_guide/Translation_Guide">
-<strong><span style="color: #2F5FAA;">Translate!</span></strong></a></li>
+<li><a href="https://libreplanet.org/wiki/GPG_guide/Translation_Guide"><strong><span style="color: #2F5FAA;">Translate!</span></strong></a></li>
 </ul>
 
                           <ul id="menu" class="os">
@@ -62,8 +59,8 @@ if you want to help. Thanks!</p>
                                  Share&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/ko/infographic.html b/ko/infographic.html
index 2ab5b7a29dd2fb8af89291efe8f91af525bbbd4c..eb29347f173019892ca7c4f7d5d699d5ca485a2c 100644 (file)
--- a/ko/infographic.html
+++ b/ko/infographic.html
@@ -4,7 +4,7 @@
                        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 
                        <title>스스로 이메일 보호하기 - GnuPG를 이용한 감시 방어 가이드</title>
-                       <meta name="keywords" content="GnuPG, GPG, privacy, email, Enigmail" />
+                       <meta name="keywords" content="GnuPG, GPG, openpgp, 감시, 개인 정보, 이메일, Enigmail" />
        <meta name="description" content="이메일 감시는 우리의 기본적인 권리를 침해하고 자유로운 발언을 할 권리를 위협합니다. 이 가이드는 30분 안에 GnuPG를 이용해 이메일을 스스로 보호하는 법에 대해 알려줍니다. " />
 
       <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -15,9 +15,7 @@
        <body>
 
 <h3 class="wip">Translation in Progress</h3>
-<p class="wip">Please contact <a
-href="mailto:esd-translators@fsf.org">&lt;esd-translators@fsf.org&gt;</a>
-if you want to help. Thanks!</p>
+<p class="wip">The <a href="/esd-ko.po">PO file</a> is where work is being done. Please help us if you can. Thanks!</p>
 
                <header class="row centered" id="header">
                        <div>

diff --git a/ko/mac.html b/ko/mac.html
index a4a6801049df69e086ef3e5adf97028a4605f6a1..abe48d610f16479663dd8243060eb2779cb2c011 100644 (file)
--- a/ko/mac.html
+++ b/ko/mac.html
@@ -14,9 +14,7 @@
        <body>
 
 <h3 class="wip">Translation in Progress</h3>
-<p class="wip">Please contact <a
-href="mailto:esd-translators@fsf.org">&lt;esd-translators@fsf.org&gt;</a>
-if you want to help. Thanks!</p>
+<p class="wip">The <a href="/esd-ko.po">PO file</a> is where work is being done. Please help us if you can. Thanks!</p>
 
 <!-- ~~~~~~~~~ GnuPG Header and introduction text  ~~~~~~~~~ -->
 <!-- ~~~~~~~~~  Revision as of 18:53, 1 June 2014 by Zakkai ~~~~~~~~~ -->
@@ -42,8 +40,7 @@ if you want to help. Thanks!</p>
 <li><a href="/sv">svenska - v4.0</a></li>
 <li><a href="/tr">Türkçe - v4.0</a></li>
 <li><a href="/zh-hans">简体中文 - v4.0</a></li>
-<li><a href="https://libreplanet.org/wiki/GPG_guide/Translation_Guide">
-<strong><span style="color: #2F5FAA;">Translate!</span></strong></a></li>
+<li><a href="https://libreplanet.org/wiki/GPG_guide/Translation_Guide"><strong><span style="color: #2F5FAA;">Translate!</span></strong></a></li>
 </ul>
 
                          <ul id="menu" class="os">
@@ -55,8 +52,8 @@ if you want to help. Thanks!</p>
                                 Share&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/ko/next_steps.html b/ko/next_steps.html
index 68809558864907462f54c329fe0d49fda39bcc62..3be2904f65291a7bb544b7d54304f788a8cc984b 100644 (file)
--- a/ko/next_steps.html
+++ b/ko/next_steps.html
@@ -15,9 +15,7 @@
        <body>
 
 <h3 class="wip">Translation in Progress</h3>
-<p class="wip">Please contact <a
-href="mailto:esd-translators@fsf.org">&lt;esd-translators@fsf.org&gt;</a>
-if you want to help. Thanks!</p>
+<p class="wip">The <a href="/esd-ko.po">PO file</a> is where work is being done. Please help us if you can. Thanks!</p>
 
 <!-- ~~~~~~~~~ GnuPG Header and introduction text  ~~~~~~~~~ -->
 
@@ -67,14 +65,14 @@ if you want to help. Thanks!</p>
          class="share-logo" alt="[GNU Social]" />
     &nbsp;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 7bf77c752f0f5677cf409e39dacb7d1adc433c6f..f0ff9b5a6ae33a6a84a8b62213ab7c64aa5250c4 100644 (file)
--- a/ko/windows.html
+++ b/ko/windows.html
@@ -15,9 +15,7 @@
        <body>
 
 <h3 class="wip">Translation in Progress</h3>
-<p class="wip">Please contact <a
-href="mailto:esd-translators@fsf.org">&lt;esd-translators@fsf.org&gt;</a>
-if you want to help. Thanks!</p>
+<p class="wip">The <a href="/esd-ko.po">PO file</a> is where work is being done. Please help us if you can. Thanks!</p>
 
 <!-- ~~~~~~~~~ GnuPG Header and introduction text  ~~~~~~~~~ -->
 <!-- ~~~~~~~~~  Revision as of 18:53, 1 June 2014 by Zakkai ~~~~~~~~~ -->
@@ -43,8 +41,7 @@ if you want to help. Thanks!</p>
 <li><a href="/sv">svenska - v4.0</a></li>
 <li><a href="/tr">Türkçe - v4.0</a></li>
 <li><a href="/zh-hans">简体中文 - v4.0</a></li>
-<li><a href="https://libreplanet.org/wiki/GPG_guide/Translation_Guide">
-<strong><span style="color: #2F5FAA;">Translate!</span></strong></a></li>
+<li><a href="https://libreplanet.org/wiki/GPG_guide/Translation_Guide"><strong><span style="color: #2F5FAA;">Translate!</span></strong></a></li>
 </ul>
 
                          <ul id="menu" class="os">
@@ -56,8 +53,8 @@ if you want to help. Thanks!</p>
                                 Share&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/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 785029d5e4dd6c1dd533144591daa980b727a10d..f21085ba26ff9c8b726ff6c8dfe0d6c1f986697b 100644 (file)
--- a/pt-br/index.html
+++ b/pt-br/index.html
@@ -54,9 +54,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 874ceaa9c908aa96826bf44abc4341d648db0986..8a65a9fc2a7f207c28a9de4afbc33a1a1e38436d 100644 (file)
--- a/pt-br/mac.html
+++ b/pt-br/mac.html
@@ -54,9 +54,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 c7ed3aa3072ae0c7def756562941aaf0541ad79e..55ee91faef6ecda8d61ddb6a6c0d890bf434df67 100644 (file)
--- a/pt-br/windows.html
+++ b/pt-br/windows.html
@@ -54,9 +54,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 4b5ea87007805a6448cb8a09673aac2c0fd4cb13..2c2ca6a259047971a3e9e678fe6b7d50056b0580 100644 (file)
--- a/ro/index.html
+++ b/ro/index.html
@@ -56,8 +56,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 4cc78959b2f12918ff905219ff9ed456c348defb..20cd1c5a24c64f906b7240f3293a26b87db8c33f 100644 (file)
--- a/ro/mac.html
+++ b/ro/mac.html
@@ -56,8 +56,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 270833e07bbb69b8afcfe2e281e8c674775f9577..09be779ec7a3f758c88ebd66cfcb2e5091546c7c 100644 (file)
--- a/ro/windows.html
+++ b/ro/windows.html
@@ -56,8 +56,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..e852e75dc53664a7c7d5db3f98ce69caf2151148 100644 (file)
--- a/ru/confirmation.html
+++ b/ru/confirmation.html
@@ -7,7 +7,7 @@
 
 <title>Самозащита электронной почты: применение GnuPG в борьбе со слежкой</title>
 <meta name="keywords"
- content="GnuPG, GPG, конфиденциальность, электронная почта, Enigmail" />
+ content="GnuPG, GPG, openpgp, слежка, конфиденциальность, электронная почта, Enigmail" />
 
 <meta name="description"
  content="Подглядывание электронной почты нарушает наши основные права и угрожает свободе слова. Это руководство за 30 минут научит вас самозащите электронной почты с помощью GnuPG." />
@@ -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 6379703b8ce5f515f5d1a953cca8c881faaeefb9..842e1863fee11f3235c4e3c30dc5b8a29f45ba4c 100644 (file)
--- a/ru/index.html
+++ b/ru/index.html
@@ -56,8 +56,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..19a8a969adbb5894aa10c76209a6213bc8fa3b1f 100644 (file)
--- a/ru/infographic.html
+++ b/ru/infographic.html
@@ -7,7 +7,7 @@
 
 <title>Самозащита электронной почты: применение GnuPG в борьбе со слежкой</title>
 <meta name="keywords"
- content="GnuPG, GPG, конфиденциальность, электронная почта, Enigmail" />
+ content="GnuPG, GPG, openpgp, слежка, конфиденциальность, электронная почта, Enigmail" />
 
 <meta name="description"
  content="Подглядывание электронной почты нарушает наши основные права и угрожает свободе слова. Это руководство за 30 минут научит вас самозащите электронной почты с помощью GnuPG." />
@@ -28,8 +28,8 @@
 href="https://fsf.org/share?u=https://u.fsf.org/zc&amp;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/mac.html b/ru/mac.html
index 93cbdfb5048d876808be74ca5fa341920506fa22..af11d954680c9a899017c16f643c7576dfedcb35 100644 (file)
--- a/ru/mac.html
+++ b/ru/mac.html
@@ -56,8 +56,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 302d9a432e815c36092962061cc5434f2f511e86..5a3b7ba86eab2d68d8476f9b21570b873706092f 100644 (file)
--- a/ru/windows.html
+++ b/ru/windows.html
@@ -56,8 +56,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 939703abd1aa249207755c46b84e6bcbed3ba836..82406f1f7809f1ee237434e5c9ac02ba8bde5922 100644 (file)
--- a/ru/workshops.html
+++ b/ru/workshops.html
@@ -60,8 +60,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..25101df0757605a6c044b87de29789664fe35b0a 100644 (file)
--- a/sq/confirmation.html
+++ b/sq/confirmation.html
@@ -4,7 +4,7 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>Vetëmbrojtje Email-i - një udhërrëfyes për të luftuar kundër survejimit me
 fshehtëzim GnuPG</title>
-<meta name="keywords" content="GnuPG, GPG, privatësi, email, Enigmail" />
+<meta name="keywords" content="GnuPG, GPG, openpgp, survejim, privatësi, email, Enigmail" />
 <meta name="description" content="Survejimi i email-it cenon të drejtat tona themelore dhe vë në rrezik fjalën
 e lirë. Ky udhërrëfyes do t’ju mësojë për 40 minuta vetëmbrojtje email-i me
 GnuPG." />
@@ -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 55ca860419d22627e6e1e93f044ac2116e57d226..f368caeefa5bf92e9aa347bdccc8d29fcb1667d4 100644 (file)
--- a/sq/index.html
+++ b/sq/index.html
@@ -54,9 +54,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..c9dc6382cb0956dec54228ec33030b57b7fb2b9c 100644 (file)
--- a/sq/infographic.html
+++ b/sq/infographic.html
@@ -4,7 +4,7 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>Vetëmbrojtje Email-i - një udhërrëfyes për të luftuar kundër survejimit me
 fshehtëzim GnuPG</title>
-<meta name="keywords" content="GnuPG, GPG, privatësi, email, Enigmail" />
+<meta name="keywords" content="GnuPG, GPG, openpgp, survejim, privatësi, email, Enigmail" />
 <meta name="description" content="Survejimi i email-it cenon të drejtat tona themelore dhe vë në rrezik fjalën
 e lirë. Ky udhërrëfyes do t’ju mësojë për 40 minuta vetëmbrojtje email-i me
 GnuPG." />
@@ -25,9 +25,9 @@ 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"
+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 8f2196767c3ae3d0883e75e4e5419cb871a94536..0fb540caee227e39ba2d854c7442811cdcae838a 100644 (file)
--- a/sq/mac.html
+++ b/sq/mac.html
@@ -54,9 +54,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 32718d382b4d06dede4392aa5925d1cc43812728..2f0bd68c45d7139cdb8859477fe084975e3b3ccd 100644 (file)
--- a/sq/windows.html
+++ b/sq/windows.html
@@ -54,9 +54,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 4c0c1b0389f3b5fdc3def231f79b9671ea70d1a1..89a1ecb040bd7629849b0d987435bd4d5f7895ab 100644 (file)
--- a/sq/workshops.html
+++ b/sq/workshops.html
@@ -2,7 +2,8 @@
 <html lang="sq">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<title>Vetëmbrojtje Email-esh - Mësojuani shokëve tuaj!</title>
+<title>Vetëmbrojtje Email-i - një udhërrëfyes për të luftuar kundër survejimit me
+fshehtëzim GnuPG</title>
 <meta name="keywords" content="GnuPG, GPG, openpgp, survejim, privatësi, email, Enigmail" />
 <meta name="description" content="Survejimi i email-it cenon të drejtat tona themelore dhe vë në rrezik fjalën
 e lirë. Ky udhërrëfyes do t’ju mësojë për 40 minuta vetëmbrojtje email-i me
@@ -52,8 +53,8 @@ email-i për këdo, përmes %40fsf">Përhapeni&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/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 2eba951d2e69f95de04bc7e7de0f9e3b2e135e7f..c137df292513ac0b1305b71caae2c7660a17895a 100644 (file)
--- a/sv/index.html
+++ b/sv/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/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/mac.html b/sv/mac.html
index 76e1d8e7818e1b82aee30e4f750bef0b0bde0885..75a6ea03f913160bd2dcd1a995f0adbb4e39c828 100644 (file)
--- a/sv/mac.html
+++ b/sv/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/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 cc698c30f80bd132d752d5151c0d3779f94b30b5..56ff5eb5c9260f07e26ab7a5b03ad20a0b434b02 100644 (file)
--- a/sv/windows.html
+++ b/sv/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/sv/workshops.html b/sv/workshops.html
index acd31dc05635d0fc983cd0e8101bc78d448bc08a..d3108e2bb9bd0abc5530365f5a94ac4965ae4310 100644 (file)
--- a/sv/workshops.html
+++ b/sv/workshops.html
@@ -2,7 +2,8 @@
 <html lang="sv">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<title>Självförsvar För E-post - Lär dina vänner!</title>
+<title>Självförsvar För E-Post - en vägledning för att bekämpa
+övervakning med GnuPG kryptering</title>
 <meta name="keywords" content="GnuPG, GPG, openpgp, surveillance, övervakning,
 integritet, privacy, email, mejl, meddelande, Enigmail" />
 <meta name="description" content="Övervakning av e-post bryter mot våra
@@ -56,8 +57,8 @@ för alla via %40fsf">Dela&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/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 3c8a6948ab20ac813334ce29b22398abc5d3efb0..7865e596419c3d1845dde0fd91e5faefc78d56a6 100644 (file)
--- a/tr/index.html
+++ b/tr/index.html
@@ -53,8 +53,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 8f1279cf29638a5d78569766f1242a9a52179544..7a0ead69d703202dba159c2f1e6612924fbab58f 100644 (file)
--- a/tr/mac.html
+++ b/tr/mac.html
@@ -53,8 +53,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 e5e6a6f94206630f81de098e4aa49be9bbd725f2..ccde1e9392cfc755dc66fd3d1943a50bf026d192 100644 (file)
--- a/tr/windows.html
+++ b/tr/windows.html
@@ -53,8 +53,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 d2471cbdbc3d8e4acbfeb29ad072fd958b1bbddb..bb3827b48062a8d4392092d735ba81a5619b4ae6 100644 (file)
--- a/tr/workshops.html
+++ b/tr/workshops.html
@@ -2,7 +2,7 @@
 <html lang="tr">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<title>E-posta Öz Savunma - Arkadaşlarınıza Öğretin!</title>
+<title>E-posta Öz Savunma - GnuPG şifreleme yardımıyla gözetimle mücadele rehberi</title>
 <meta name="keywords" content="GnuPG, GPG, openpgp, gözetim, mahremiyet, eposta, Enigmail" />
 <meta name="description" content="E-posta gözetimi temel haklarımızı ihlal eder ve ifade özgürlüğümüzü tehdit
 eder. Bu rehber GnuPG yardımıyla 30 dakikada e-posta öz savunmayı
@@ -55,8 +55,8 @@ for everyone via %40fsf">PAYLAŞ&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/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 f6fcf5f3c54e1302bfe8c8123e3ee5d69267fb3a..35ca2fc729b232670de557b2f836db189216ae4a 100644 (file)
--- a/zh-hans/index.html
+++ b/zh-hans/index.html
@@ -52,8 +52,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/mac.html b/zh-hans/mac.html
index 4b328bd413c79308af5618aa41c01a60c4e8c5d7..cce271a21a0ecad78f892679a5cbab9bc9011921 100644 (file)
--- a/zh-hans/mac.html
+++ b/zh-hans/mac.html
@@ -52,8 +52,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 35b3218e5adc977fda8c3b88c7f36d156539a4cd..66a8b7dd08694fe3ed83a41d00d66e7c8b015d9c 100644 (file)
--- a/zh-hans/windows.html
+++ b/zh-hans/windows.html
@@ -52,8 +52,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 9aa990d8c40756e25242765ac526e51ddd1bbca4..d2087cc1a0388b0369bc545ca4a8ec4e17eb77ec 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" />
@@ -54,8 +54,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;