Commit 6153f015 authored by Tails translators's avatar Tails translators
Browse files

merge with main git using merge_canonical_changes.py.

wiki/src/install/expert/usb.ar.po: updating as wiki/src/install/expert/usb.de.po has changed.
wiki/src/install/expert/usb.ca.po: updating as wiki/src/install/expert/usb.de.po has changed.
wiki/src/install/expert/usb.id.po: updating as wiki/src/install/expert/usb.de.po has changed.
wiki/src/install/expert/usb.pl.po: updating as wiki/src/install/expert/usb.de.po has changed.
wiki/src/install/expert/usb.ru.po: updating as wiki/src/install/expert/usb.de.po has changed.
wiki/src/install/expert/usb.sr_Latn.po: updating as wiki/src/install/expert/usb.de.po has changed.
wiki/src/install/expert/usb.tr.po: updating as wiki/src/install/expert/usb.de.po has changed.
wiki/src/install/expert/usb.zh.po: updating as wiki/src/install/expert/usb.de.po has changed.
wiki/src/install/expert/usb.zh_TW.po: updating as wiki/src/install/expert/usb.de.po has changed.
wiki/src/support/chat.ar.po: updating as wiki/src/support/chat.de.po has changed.
wiki/src/support/chat.ca.po: updating as wiki/src/support/chat.de.po has changed.
wiki/src/support/chat.id.po: updating as wiki/src/support/chat.de.po has changed.
wiki/src/support/chat.pl.po: updating as wiki/src/support/chat.de.po has changed.
wiki/src/support/chat.ru.po: updating as wiki/src/support/chat.de.po has changed.
wiki/src/support/chat.sr_Latn.po: updating as wiki/src/support/chat.de.po has changed.
wiki/src/support/chat.tr.po: updating as wiki/src/support/chat.de.po has changed.
wiki/src/support/chat.zh.po: updating as wiki/src/support/chat.de.po has changed.
wiki/src/support/chat.zh_TW.po: updating as wiki/src/support/chat.de.po has changed.
parents edbc621f d550ce30
#
# This is an implementation of the Riseup OpenPGP Best Practices
# https://help.riseup.net/en/security/message-security/openpgp/best-practices
# https://riseup.net/en/security/message-security/openpgp/best-practices
#
......
......@@ -1110,7 +1110,7 @@ GnuPG tools (namely: GPG itself and Seahorse) are configured to use
<https://keys.opengpg.org> via its Onion service, since it's reliable.
GnuPG is configured accordingly to the [OpenPGP Best
Practices](https://help.riseup.net/en/security/message-security/openpgp/best-practices),
Practices](https://riseup.net/en/security/message-security/openpgp/best-practices),
e.g. to prefer non-outdated digest algorithms from the
SHA-2 family, to force exclusion of the version string in ASCII armored
output, to avoid automatically locating and retrieving keys, and to
......
......@@ -56,6 +56,26 @@ help](https://support.mozilla.org/en-US/products/thunderbird).
If the automatic configuration fails, consult your email provider
about how to configure your email account manually.
<div class="tip" id="gmail">
<h2>Configuring a Gmail account</h2>
<p>If you are using Gmail, you need to first configure your account to
allow access from other email clients, such as
<span class="application">Thunderbird</span>.</p>
<p>To configure your Gmail account to allow access from
<span class="application">Thunderbird</span>, you need to:</p>
<ol>
<li>Enable IMAP or POP. See <a href="https://support.google.com/mail/answer/7126229">Gmail Help: Check Gmail through other email platforms</a>.</li>
<li>Turn on 2-Step Verification. See <a href="https://support.google.com/accounts/answer/185839">Google Account Help: 2-Step Verification</a>.</li>
<li>Create an App Password. See <a href="https://support.google.com/mail/answer/185833">Gmail Help: Sign in with App Passwords</a>.</li>
<li>Use the App Password in <em>Thunderbird</em>.</li>
</ol>
</div>
1. If the automatic configuration succeeds, you might have to specify
which protocol to use to connect to your email provider, either
<span class="guilabel">IMAP</span> or <span class="guilabel">POP</span>.
......
......@@ -94,7 +94,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
......@@ -427,10 +427,37 @@ msgstr "[[!inline pages=\"install/inc/steps/restart_first_time.inline.ar\" raw=\
msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline.ar\" raw=\"yes\" sort=\"age\"]]\n"
#, fuzzy
msgid "Install Tails using <span class=\"command\">dd</span>\n"
msgid ""
" a. To make a non-exportable certification that will never be shared\n"
" with others:\n"
msgstr ""
" a. Um eine nicht-exportierbare Zertifizierung zu erstellen, die niemals "
"mit\n"
" anderen geteilt wird:\n"
msgid ""
" b. To make an exportable certification of the Tails signing\n"
" key and publish it on the public key servers:\n"
msgstr ""
" b. Um eine exportierbare Zertifizierung des Signaturschlüssels von Tails\n"
" zu erstellen und diese auf den öffentlichen Schlüsselservern zu "
"veröffentlichen:\n"
msgid ""
" gpg --sign-key A490D0F4D311A4153E2BB7CADBB802B258ACD84F\n"
" gpg --send-keys A490D0F4D311A4153E2BB7CADBB802B258ACD84F\n"
msgstr ""
" gpg --sign-key A490D0F4D311A4153E2BB7CADBB802B258ACD84F\n"
" gpg --send-keys A490D0F4D311A4153E2BB7CADBB802B258ACD84F\n"
msgid ""
" Doing so allows people who verified\n"
" your key to verify your certification and, as a consequence, build\n"
" more trust in the Tails signing key.\n"
msgstr ""
"Installieren Sie den <span class=\"application\">Tails Installer</span>\n"
" Dies erlaubt es Personen, die Ihren Schlüssel verifiziert\n"
" haben, Ihre Zertifizierung zu verifizieren und als Konsequenz daraus\n"
" mehr Vertrauen in den Signaturschlüssel von Tails aufzubauen.\n"
#~ msgid ""
#~ " sig! 0x9C31503C6D866396 2015-02-03 Stefano Zacchiroli "
......@@ -438,3 +465,8 @@ msgstr ""
#~ msgstr ""
#~ " sig! 0x9C31503C6D866396 2015-02-03 Stefano Zacchiroli "
#~ "<zack@upsilon.cc>\n"
#, fuzzy
#~ msgid "Install Tails using <span class=\"command\">dd</span>\n"
#~ msgstr ""
#~ "Installieren Sie den <span class=\"application\">Tails Installer</span>\n"
......@@ -92,7 +92,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
......@@ -425,10 +425,37 @@ msgstr "[[!inline pages=\"install/inc/steps/restart_first_time.inline.ca\" raw=\
msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline.ca\" raw=\"yes\" sort=\"age\"]]\n"
#, fuzzy
msgid "Install Tails using <span class=\"command\">dd</span>\n"
msgid ""
" a. To make a non-exportable certification that will never be shared\n"
" with others:\n"
msgstr ""
" a. Um eine nicht-exportierbare Zertifizierung zu erstellen, die niemals "
"mit\n"
" anderen geteilt wird:\n"
msgid ""
" b. To make an exportable certification of the Tails signing\n"
" key and publish it on the public key servers:\n"
msgstr ""
" b. Um eine exportierbare Zertifizierung des Signaturschlüssels von Tails\n"
" zu erstellen und diese auf den öffentlichen Schlüsselservern zu "
"veröffentlichen:\n"
msgid ""
" gpg --sign-key A490D0F4D311A4153E2BB7CADBB802B258ACD84F\n"
" gpg --send-keys A490D0F4D311A4153E2BB7CADBB802B258ACD84F\n"
msgstr ""
" gpg --sign-key A490D0F4D311A4153E2BB7CADBB802B258ACD84F\n"
" gpg --send-keys A490D0F4D311A4153E2BB7CADBB802B258ACD84F\n"
msgid ""
" Doing so allows people who verified\n"
" your key to verify your certification and, as a consequence, build\n"
" more trust in the Tails signing key.\n"
msgstr ""
"Installieren Sie den <span class=\"application\">Tails Installer</span>\n"
" Dies erlaubt es Personen, die Ihren Schlüssel verifiziert\n"
" haben, Ihre Zertifizierung zu verifizieren und als Konsequenz daraus\n"
" mehr Vertrauen in den Signaturschlüssel von Tails aufzubauen.\n"
#~ msgid ""
#~ " sig! 0x9C31503C6D866396 2015-02-03 Stefano Zacchiroli "
......@@ -436,3 +463,8 @@ msgstr ""
#~ msgstr ""
#~ " sig! 0x9C31503C6D866396 2015-02-03 Stefano Zacchiroli "
#~ "<zack@upsilon.cc>\n"
#, fuzzy
#~ msgid "Install Tails using <span class=\"command\">dd</span>\n"
#~ msgstr ""
#~ "Installieren Sie den <span class=\"application\">Tails Installer</span>\n"
......@@ -101,11 +101,11 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
"<p>Um zu lernen, wie Sie sich einen OpenPGP-Schlüssel erstellen, sehen Sie auf \n"
"<a href=\"https://help.riseup.net/de/security/message-security/openpgp/gpg-keys\">OpenPGP-Schlüssel\n"
"<a href=\"https://riseup.net/de/security/message-security/openpgp/gpg-keys\">OpenPGP-Schlüssel\n"
"verwalten</a> von <em>Riseup</em> nach.</p>\n"
#. type: Plain text
......
......@@ -100,11 +100,11 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
"<p>Para aprender como crear tu propia llave OpenPGP, lee\n"
"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> por <em>Riseup</em>.</p>\n"
#. type: Plain text
......
......@@ -92,7 +92,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
......
......@@ -98,11 +98,11 @@ msgstr "<p>Pour suivre ces instructions, vous aurez besoin d'une clé OpenPGP.</
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
"<p>Pour apprendre à créer une clé OpenPGP, voir\n"
"<a href=\"https://help.riseup.net/fr/security/message-security/openpgp/gpg-keys\">Gestion\n"
"<a href=\"https://riseup.net/fr/security/message-security/openpgp/gpg-keys\">Gestion\n"
"des clés OpenPGP</a> par <em>Riseup</em>.</p>\n"
#. type: Plain text
......
......@@ -92,7 +92,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
......
......@@ -98,11 +98,11 @@ msgstr "<p>Per seguire queste istruzioni devi avere una tua chiave OpenPGP.</p>\
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
"<p>Per imparare come creare tu stessa una chiave OpenPGP, vedi\n"
"<a href=\"https://help.riseup.net/it/security/message-security/openpgp/gpg-keys\">Managing\n"
"<a href=\"https://riseup.net/it/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> di <em>Riseup</em>.</p>\n"
#. type: Plain text
......
......@@ -27,7 +27,7 @@ the Tails USB image.
key.</p>
<p>To learn how to create yourself an OpenPGP key, see
<a href="https://help.riseup.net/en/security/message-security/openpgp/gpg-keys">Managing
<a href="https://riseup.net/en/security/message-security/openpgp/gpg-keys">Managing
OpenPGP Keys</a> by <em>Riseup</em>.</p>
</div>
......
......@@ -93,7 +93,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
......
......@@ -95,7 +95,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
......
......@@ -93,7 +93,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
......
......@@ -93,7 +93,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
......
......@@ -92,7 +92,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
......
......@@ -92,7 +92,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
......
......@@ -99,11 +99,11 @@ msgstr ""
#, no-wrap
msgid ""
"<p>To learn how to create yourself an OpenPGP key, see\n"
"<a href=\"https://help.riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"<a href=\"https://riseup.net/en/security/message-security/openpgp/gpg-keys\">Managing\n"
"OpenPGP Keys</a> by <em>Riseup</em>.</p>\n"
msgstr ""
"<p>要了解如何建立自己的 OpenPGP-密鑰,請見 \n"
"<a href=\"https://help.riseup.net/de/security/message-security/openpgp/gpg-keys\">管理\n"
"<a href=\"https://riseup.net/de/security/message-security/openpgp/gpg-keys\">管理\n"
"OpenPGP 密鑰</a> (英文) 版 <em>Riseup</em></p>\n"
#. type: Plain text
......
......@@ -1009,7 +1009,7 @@ div.bug, div.caution, div.next, div.note, div.tip, div.trophy {
background-color: #FFFFF0;
border: 1px solid #E0E0DF;
border-radius: 4px;
padding: 1.35em 6px 0em;
padding: 1.5em 6px 0em;
background-position: 6px 0.5em;
background-repeat: no-repeat;
min-height: 48px;
......@@ -1040,6 +1040,14 @@ div.bug pre, div.caution pre, div.next pre, div.note pre, div.tip pre, div.troph
max-width: 30em;
}
div.bug *:first-child, div.caution *:first-child, div.next *:first-child, div.note *:first-child, div.tip *:first-child, div.trophy *:first-child {
margin-top: 0;
}
div.bug *:last-child, div.caution *:last-child, div.next *:last-child, div.note *:last-child, div.tip *:last-child, div.trophy *:last-child {
margin-bottom: 1.5em;
}
/* Code, preformatted text, and command lines */
code {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment