Commit 343ad3d7 authored by sajolida's avatar sajolida
Browse files

Merge remote-tracking branch 'cbrownstein/doc/17492-secure-boot' into web/release-4.5

parents 964bbefc 18cafb3f
......@@ -134,7 +134,7 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"resist attacks that block the usage of Tor using circumvention tools such as "
"[[bridges|doc/first_steps/startup_options/bridge_mode]]."
"[[bridges|doc/first_steps/welcome_screen/bridge_mode]]."
msgstr ""
#. type: Plain text
......
......@@ -128,7 +128,7 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"resist attacks that block the usage of Tor using circumvention tools such as "
"[[bridges|doc/first_steps/startup_options/bridge_mode]]."
"[[bridges|doc/first_steps/welcome_screen/bridge_mode]]."
msgstr ""
#. type: Plain text
......
......@@ -163,10 +163,10 @@ msgstr "Sich mit Diensten verbinden, die andernfalls zensiert wären;"
#. type: Bullet: ' - '
msgid ""
"resist attacks that block the usage of Tor using circumvention tools such as "
"[[bridges|doc/first_steps/startup_options/bridge_mode]]."
"[[bridges|doc/first_steps/welcome_screen/bridge_mode]]."
msgstr ""
"Angriffen, die Tor blockieren, widerstehen, indem Sie Umgehungssoftware wie "
"[[Tor-Bridges|doc/first_steps/startup_options/bridge_mode]] (Brücken in das "
"[[Tor-Bridges|doc/first_steps/welcome_screen/bridge_mode]] (Brücken in das "
"Tor-Netzwerk) einsetzen."
#. type: Plain text
......
......@@ -159,10 +159,10 @@ msgstr "conectarte a servicios que de otro modo estarían censurados;"
#. type: Bullet: ' - '
msgid ""
"resist attacks that block the usage of Tor using circumvention tools such as "
"[[bridges|doc/first_steps/startup_options/bridge_mode]]."
"[[bridges|doc/first_steps/welcome_screen/bridge_mode]]."
msgstr ""
"resistir ataques que bloquean el uso de Tor, mediante herramientas de "
"elusión como los [[puentes|doc/first_steps/startup_options/bridge_mode]]."
"elusión como los [[puentes|doc/first_steps/welcome_screen/bridge_mode]]."
#. type: Plain text
msgid ""
......
......@@ -175,10 +175,10 @@ msgstr "به سیستم‌هایی متصل شوید که در غیر این ص
#. type: Bullet: ' - '
msgid ""
"resist attacks that block the usage of Tor using circumvention tools such as "
"[[bridges|doc/first_steps/startup_options/bridge_mode]]."
"[[bridges|doc/first_steps/welcome_screen/bridge_mode]]."
msgstr ""
"مقاومت در مقابل حملاتی که با استفاده از ابزارهای فیلتر شکن مانند "
"[[bridges|doc/first_steps/startup_options/bridge_mode]]. مانع از استفاده تور "
"[[bridges|doc/first_steps/welcome_screen/bridge_mode]]. مانع از استفاده تور "
"می‌شوند."
#. type: Plain text
......
......@@ -160,11 +160,11 @@ msgstr "vous connecter à des services qui seraient censurés sinon ;"
#. type: Bullet: ' - '
msgid ""
"resist attacks that block the usage of Tor using circumvention tools such as "
"[[bridges|doc/first_steps/startup_options/bridge_mode]]."
"[[bridges|doc/first_steps/welcome_screen/bridge_mode]]."
msgstr ""
"résister à des attaques qui bloquent l'utilisation de Tor, grâce à des "
"outils de contournement tels que les [[bridges|doc/first_steps/"
"startup_options/bridge_mode]]."
"welcome_screen/bridge_mode]]."
#. type: Plain text
msgid ""
......
......@@ -130,7 +130,7 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"resist attacks that block the usage of Tor using circumvention tools such as "
"[[bridges|doc/first_steps/startup_options/bridge_mode]]."
"[[bridges|doc/first_steps/welcome_screen/bridge_mode]]."
msgstr ""
#. type: Plain text
......
......@@ -161,10 +161,10 @@ msgstr "connetterti a servizi che altrimenti sarebbero censurati;"
#. type: Bullet: ' - '
msgid ""
"resist attacks that block the usage of Tor using circumvention tools such as "
"[[bridges|doc/first_steps/startup_options/bridge_mode]]."
"[[bridges|doc/first_steps/welcome_screen/bridge_mode]]."
msgstr ""
"resistere ad attacchi che bloccano l'uso di Tor, usando strumenti di "
"aggiramento come i [[bridge|doc/first_steps/startup_options/bridge_mode]]."
"aggiramento come i [[bridge|doc/first_steps/welcome_screen/bridge_mode]]."
#. type: Plain text
msgid ""
......
......@@ -50,7 +50,7 @@ Using Tor you can:
- be anonymous online by hiding your location,
- connect to services that would be censored otherwise;
- resist attacks that block the usage of Tor using circumvention tools
such as [[bridges|doc/first_steps/startup_options/bridge_mode]].
such as [[bridges|doc/first_steps/welcome_screen/bridge_mode]].
To learn more about Tor, see the official [Tor
website](https://www.torproject.org/), particularly the following pages:
......
......@@ -129,7 +129,7 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"resist attacks that block the usage of Tor using circumvention tools such as "
"[[bridges|doc/first_steps/startup_options/bridge_mode]]."
"[[bridges|doc/first_steps/welcome_screen/bridge_mode]]."
msgstr ""
#. type: Plain text
......
......@@ -160,10 +160,10 @@ msgstr "conectar à serviços que de outra forma estariam censurados;"
#. type: Bullet: ' - '
msgid ""
"resist attacks that block the usage of Tor using circumvention tools such as "
"[[bridges|doc/first_steps/startup_options/bridge_mode]]."
"[[bridges|doc/first_steps/welcome_screen/bridge_mode]]."
msgstr ""
"resistir a ataques que bloqueiam o uso do Tor usando ferramentas de "
"circunscrição tais como [[bridges|doc/first_steps/startup_options/"
"circunscrição tais como [[bridges|doc/first_steps/welcome_screen/"
"bridge_mode]]."
#. type: Plain text
......
......@@ -147,11 +147,11 @@ msgstr "пользоваться сервисами, которые запрещ
#. type: Bullet: ' - '
msgid ""
"resist attacks that block the usage of Tor using circumvention tools such as "
"[[bridges|doc/first_steps/startup_options/bridge_mode]]."
"[[bridges|doc/first_steps/welcome_screen/bridge_mode]]."
msgstr ""
"отражать атаки, которые блокируют использование Tor, используя обходные "
"инструменты, например, [[сетевые "
"мосты|doc/first_steps/startup_options/bridge_mode]]."
"мосты|doc/first_steps/welcome_screen/bridge_mode]]."
#. type: Plain text
msgid ""
......
......@@ -125,7 +125,7 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"resist attacks that block the usage of Tor using circumvention tools such as "
"[[bridges|doc/first_steps/startup_options/bridge_mode]]."
"[[bridges|doc/first_steps/welcome_screen/bridge_mode]]."
msgstr ""
#. type: Plain text
......
......@@ -128,7 +128,7 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"resist attacks that block the usage of Tor using circumvention tools such as "
"[[bridges|doc/first_steps/startup_options/bridge_mode]]."
"[[bridges|doc/first_steps/welcome_screen/bridge_mode]]."
msgstr ""
#. type: Plain text
......
......@@ -138,9 +138,9 @@ msgstr "连接上已被审查禁止的服务"
#. type: Bullet: ' - '
msgid ""
"resist attacks that block the usage of Tor using circumvention tools such as "
"[[bridges|doc/first_steps/startup_options/bridge_mode]]."
"[[bridges|doc/first_steps/welcome_screen/bridge_mode]]."
msgstr ""
"使用[[网桥|doc/first_steps/startup_options/bridge_mode]]作为规避工具抵抗对 Tor 的封锁攻击。"
"使用[[网桥|doc/first_steps/welcome_screen/bridge_mode]]作为规避工具抵抗对 Tor 的封锁攻击。"
#. type: Plain text
msgid ""
......
......@@ -137,9 +137,9 @@ msgstr "連結上可能已被審查禁止的服務"
#. type: Bullet: ' - '
msgid ""
"resist attacks that block the usage of Tor using circumvention tools such as "
"[[bridges|doc/first_steps/startup_options/bridge_mode]]."
"[[bridges|doc/first_steps/welcome_screen/bridge_mode]]."
msgstr ""
"使用Tor作為規避工具來抵抗封鎖攻擊,例如[[Tor-橋接|doc/first_steps/startup_options/bridge_mode]] 。"
"使用Tor作為規避工具來抵抗封鎖攻擊,例如[[Tor-橋接|doc/first_steps/welcome_screen/bridge_mode]] 。"
#. type: Plain text
msgid ""
......
......@@ -397,7 +397,7 @@ P12: [WORK] The card could be intercepted. The phone line could be cut.
<p>See also:</p>
<ul>
<li>[[Can I hide the fact that I am using Tails?|doc/about/fingerprint]]</li>
<li>[[Tor bridge mode|doc/first_steps/startup_options/bridge_mode]]</li>
<li>[[Tor bridge mode|doc/first_steps/welcome_screen/bridge_mode]]</li>
</ul>
</div>
......
......@@ -313,15 +313,15 @@ Example (YAML):
- caribou
- dasher
- orca
- page: doc/first_steps/startup_options
- page: doc/first_steps/welcome_screen
package: tails-greeter
files:
- config/binary_local-hooks/*grub*
- config/binary_local-hooks/*syslinux*
- config/chroot_local-includes/etc/dconf/db/local.d/00_Tails_defaults
- page: doc/first_steps/startup_options/administration_password
- page: doc/first_steps/welcome_screen/administration_password
package: tails-greeter
- page: doc/first_steps/startup_options/bridge_mode
- page: doc/first_steps/welcome_screen/bridge_mode
packages:
- obfs4proxy
- tor
......@@ -345,8 +345,8 @@ Example (YAML):
- features/images/TailsGreeter*
pages:
- doc/first_steps/persistence/use
- doc/first_steps/startup_options
- doc/first_steps/startup_options/*
- doc/first_steps/welcome_screen
- doc/first_steps/welcome_screen/*
### Automated testing
......
# Introduction
Our [[documentation|doc/first_steps/startup_options/windows_camouflage]] reads "if
Our [[documentation|doc/first_steps/welcome_screen/windows_camouflage]] reads "if
you are using a computer in public you may want to avoid attracting unwanted
attention by changing the way Tails looks into something that resembles
Microsoft Windows 8." This is what we call the "Windows camouflage".
[[!img doc/first_steps/startup_options/windows_camouflage/windows_camouflage.jpg size=320x240 link=no]]
[[!img doc/first_steps/welcome_screen/windows_camouflage/windows_camouflage.jpg size=320x240 link=no]]
The Windows camouflage will be [[!tails_ticket 8064 desc="broken in Debian Jessie based Tails"]]. This blueprint
describes what should be done to update the Windows camouflage to Jessie.
......@@ -40,7 +40,7 @@ Windows camouflage update MUST include:
- a GNOME Shell theme/extension that looks like Windows 8.1 desktop panel compatible with
the version on GNOME Shell shipped in Debian Jessie (3.14.2)
- a way to enable all the required components to provide the camouflage mode
that can be triggered by [[Tails Greeter|/doc/first_steps/startup_options#greeter]]
that can be triggered by [[Tails Greeter|/doc/first_steps/welcome_screen]]
Windows camouflage MAY include:
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2020-03-21 09:51+0000\n"
"POT-Creation-Date: 2020-03-25 05:24+0000\n"
"PO-Revision-Date: 2020-03-12 17:35+0000\n"
"Last-Translator: Muri Nicanor <muri@immerda.ch>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -522,7 +522,7 @@ msgid "Sysadmin: [[contact|contribute/how/sysadmin/#contact]]"
msgstr ""
#. type: Bullet: ' - '
msgid "*Tails Greeter* (Python): alan, intrigeri"
msgid "Welcome Screen (Python): alan, intrigeri"
msgstr ""
#. type: Bullet: ' - '
......
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