Commit dbe21350 authored by emma peel's avatar emma peel
Browse files

mostly russian files and ci config

also other langs
parents ecbea13b 337a9076
stages:
- test
- refresh
- build
test:
test-PO-files:
stage: test
script:
- apt-get install -qq -y i18nspector
- git config --global http.sslVerify false
- git submodule sync --recursive
- git submodule update --init --recursive
- wiki/src/contribute/l10n_tricks/check_po.sh
build:
stage: build
refresh-wiki:
stage: refresh
script:
- apt-get install -qq -y ikiwiki libyaml-perl libyaml-libyaml-perl
- apt-get install -qq -y libyaml-syck-perl perlmagick po4a ruby
- ikiwiki --setup ikiwiki.setup --refresh
- git status
build-wiki:
stage: build
script:
- apt-get install -qq -y ikiwiki libyaml-perl libyaml-libyaml-perl
- apt-get install -qq -y libyaml-syck-perl perlmagick po4a ruby
- ikiwiki --setup ikiwiki.setup --rebuild
- git status
cache:
key: "$CI_PROJECT_PATH_SLUG-$CI_JOB_NAME"
......@@ -31,4 +45,4 @@ before_script:
mkdir -p {${APT_CACHE_ARCHIVES},${APT_STATE_LISTS}}/partial &&
apt-get update -qq;
fi
- apt-get install -qq -y ikiwiki libyaml-perl libyaml-libyaml-perl libyaml-syck-perl perlmagick po4a ruby i18nspector
- apt-get install -qq -y ca-certificates
......@@ -211,3 +211,100 @@ The ISOBoot case would still require a manifest of files we extract
from the ISO (bootloader code and configuration), but indeed that
manifest could be in the ISO itself, and thus its authenticity and
integrity would be signed/verified at the same time as the ISO.
# Temporary stop gap: IUKs on steroids
(This idea was originally conceived in the comments of [[!tails_ticket
11131]].)
Without any major redesign of our current incremental upgrade system
(i.e. comparatively cheap) we can allow users upgrade only through
IUKs for much longer, probably throughout a whole Tails series,
e.g. all of Tails 2.x, which we'll use for our examples below since we
moved to 3.x already so we have all data we need to test this idea.
## Basic idea
### Inside Tails
* Tails Upgrader fetches the UDF for the version of Tails that was
originally installed (instead of the version of the running Tails),
* We remove any previous IUK when a new IUK is installed.
### Release management
When we release version M.N, then, for all previous versions M.X since
M.0, we generate a M.X_to_M.N IUK.
(Actually, it is not necessary to choose the first release of a series
(like M.0) as the "synchronization point". We could add another one
half way through the series, or make every tenth release a
synchronization point, or we could do it when when the IUK simply
grows too big. We have lot's of options to balance this according to
our needs, but the first release of a series seems like a technically
reasonable choice according to the data we have for the 2.x series
(see below), but also nice from the user's PoV if the only time a
manual upgrade is needed is when upgrading between series.)
### Example
1. I install Tails 2.2 on a USB stick.
2. Later when Tails 2.3 is released I upgrade to it via the 2.2_to_2.3
IUK (i.e. identical to our original scheme).
3. When Tails 2.4 is released I upgrade to it via the 2.2_to_2.4 IUK
(in our original scheme we would stack 2.3_to_2.4 on top of
2.2_to_2.3) and remove the 2.2_to_2.3 IUK (in our original scheme
we never remove IUKs).
Notice how step 3 can be repeated for each new release, so that we in
the end reach the final release of the series, Tails 2.12. And notice
how we in step 1 could have installed any 2.x release.
## Problems due to IUK size
We'll be dealing with larger IUKs (because generally more and more
changes accumulate between different Tails versions) and only have one
present at a time, with the exception being while we are installing a
new IUK (then two will be present). Let's look at the IUK sizes
towards the end of the 2.x series as if the last manual install was
for Tails 2.0, which is the excepted worst case:
569M Tails_i386_2.0_to_2.9.iuk
678M Tails_i386_2.0_to_2.10.iuk
682M Tails_i386_2.0_to_2.11.iuk
634M Tails_i386_2.0_to_2.12.iuk
The IUK size is involved in at least three concerns:
* Disk space needs on mirrors: for 2.x there were 14 non-rc/beta/alpha
Tails releases, so there would be 13 IUKs for the last release
(2.12). So 14*682 MB ~= 10 GB would have been needed.
* Disk space needs on the Tails system partition: we need to be able
to store two large IUKs. Apparently the worst case for 2.x is the
2.10 to 2.11 upgrade if 2.0 was the version originally installed:
- The 2.0 installation itself uses 1082 MB, so upgraded to 2.10 the
total usage is 1082 MB + 678 MB = 1760 MB.
- Due to the Upgrader requiring 3x the size of the IUK on the Tails
system partition, the actual requirement is 1760 MB + 3*682 MB =
3806 MB of free disk space. That wouldn't have worked during the
2.x times, when the system partition was 2.5 GB, and it barely
would work with our current 4.0 GB partition.
- When both IUKs are present at the same time (i.e. before rebooting
after having applied the upgrade) the disk usage is 1760 MB + 682
MB = 2442 MB.
- After the old IUK is purged the disk usage is down to 2442 MB -
678 MB = 1764 MB.
* Bandwidth needs of the RM. Uploading 10 GB of IUKs can be a pain for
some of us, but that can easily be solved by making it possible to
generate IUKs on lizard (and then compare them with the ones you
generated locally. Thanks reproducibility!).
## Support upgrading very old Tails
We probably do not want to support upgrading very old (e.g. from six
months ago) Tails installations because our signing key might have
been updated in the meantime, and/or some critical update to Tails
Upgrader (e.g. UDF version). So unless we want to spend a lot of
resources on solving these problems, which roughly translates to "you
can take 4+ month breaks from Tails", let's stick with our current
"you can at most skip one *planned* release" promise.
......@@ -5,11 +5,19 @@
Roadmap
=======
None at the moment, see [[!tails_ticket 11679]].
None at the moment, see:
* as a starting point: [[!tails_ticket 11679]]
* regarding improving upgrades: [[!tails_ticket 11131]],
[[!tails_ticket 15277]] and their blueprint
* regarding shipping a disk image that can be dd'ed to a USB stick and
produce a _final Tails_, see
[[usb_install_and_upgrade/usb_bootable_disk_image]]
Resources
=========
* [[notes about UEFI|UEFI]]
* [[notes about GPT|usb_install_and_upgrade/gpt]]
* USB installation [[specification and design|contribute/design/installation]]
* archived [[roundup of existing tools|todo/usb_install_and_upgrade/archive]]
* archived [[roundup of existing tools|usb_install_and_upgrade/archive]]
[[!meta title="Bootable USB disk image"]]
[[!toc levels=2]]
# Motivation
This is about generating, distributing and installing Tails as a disk
image that, once copied bit-by-bit to a USB stick, produces a _final
Tails_ (GPT, UEFI-bootable, ready to get a persistent volume).
This would:
- avoid the need for a second USB stick and an intermediary Tails
during the initial installation and full manual upgrade; as
a consequence:
- big UX win
- avoid the
[[!tails_ticket 12146 desc="intermediary Tails not being bootable on many UEFI systems"]]
problem
- removes a blocker for
[[!tails_ticket 6560 desc="Secure Boot support"]] (a non-GPT
intermediary Tails would never work with Secure Boot enabled)
- allow us to use simpler, more reliable installers at least on
Windows and macOS and then:
- avoids user confusion that results in creating a non-bootable
device e.g. [[!tails_ticket 13206]]
- relying on third-party tools becomes less painful
- pave the way to a self-extracting file offered for download,
that would bundle the disk image, the program used to copy it to
the target device, and some wrapper that would run that program
with the right arguments
# Generating
`live-build` can generate `hdd` images. Alternatively, we can
post-process our ISO image to create a USB-bootable disk image.
Open questions:
- What size should the system partition be? Do we grow the system
partition on first boot (from the initramfs) e.g.
with [[!debpts cloud-init]] or the Rasbian tools
(<https://www.raspberrypi.org/downloads/noobs/>,
<https://www.raspberrypi.org/downloads/raspbian/>)?
- What about DVD support? Can we stop distributing an ISO image
some day?
# Distributing
XXX: impact on mirrors' storage space?
# Installing
## from Windows
XXX
### Win32 Disk Imager
[[!tails_ticket 14447]]
## from macOS
XXX
## from Linux
_GNOME Disks_ has a _Restore Disk Image_ feature that basically does
`dd` with a nice progress bar.
# Upgrading
This approach does not make full, manual upgrades any simpler. For the
ideas we have to fix that other problem, see [[!tails_ticket 11131]]
and [[blueprint/Endless_upgrades]].
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2017-06-29 12:53+0000\n"
"POT-Creation-Date: 2018-02-04 10:28+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -41,7 +41,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>For example, if you first [[authenticate the Tails signing key\n"
"through the OpenPGP Web of Trust|install/download/openpgp#wot]], then\n"
"through the OpenPGP Web of Trust|install/download#wot]], then\n"
"you can verify our others keys as they are all certified by the Tails\n"
"signing key.</p>\n"
msgstr ""
......@@ -79,8 +79,8 @@ msgstr ""
#. type: Plain text
msgid ""
"This key has an encryption subkey. Please use it to encrypt email sent to "
"the core developers encrypted mailing list: "
"[[tails@boum.org|about/contact#tails]]."
"the core developers encrypted mailing list: [[tails@boum.org|about/"
"contact#tails]]."
msgstr ""
#. type: Title ###
......@@ -94,8 +94,8 @@ msgid ""
"0.6~rc3, released images were signed by this key. This purpose is now "
"deprecated: further releases will be signed by a dedicated, safer signing "
"key. As of 2010 October 7th, our mailing list key signature only means our "
"mailing list software checked the signed content was originally "
"OpenPGP-signed by a Tails core developer."
"mailing list software checked the signed content was originally OpenPGP-"
"signed by a Tails core developer."
msgstr ""
#. type: Title -
......@@ -127,14 +127,10 @@ msgstr ""
#, no-wrap
msgid ""
" pub 4096R/0x1D2975EDF93E735F 2009-08-14 [expires: 2018-10-01]\n"
" Key fingerprint = 09F6 BC8F EEC9 D8EE 005D BAA4 1D29 75ED F93E "
"735F\n"
" uid Tails developers (Schleuder mailing-list) "
"<tails@boum.org>\n"
" uid Tails list (schleuder list) "
"<tails-request@boum.org>\n"
" uid Tails list (schleuder list) "
"<tails-owner@boum.org>\n"
" Key fingerprint = 09F6 BC8F EEC9 D8EE 005D BAA4 1D29 75ED F93E 735F\n"
" uid Tails developers (Schleuder mailing-list) <tails@boum.org>\n"
" uid Tails list (schleuder list) <tails-request@boum.org>\n"
" uid Tails list (schleuder list) <tails-owner@boum.org>\n"
" sub 4096R/0xD843C2F5E89382EB 2009-08-14 [expires: 2018-10-01]\n"
msgstr ""
......@@ -184,7 +180,8 @@ msgid "to sign Tails released images;"
msgstr ""
#. type: Bullet: '- '
msgid "to certify other cryptographic public keys needed for Tails development."
msgid ""
"to certify other cryptographic public keys needed for Tails development."
msgstr ""
#. type: Plain text
......@@ -206,15 +203,12 @@ msgid ""
" [gfshare](http://www.digital-scurf.org/software/libgfshare).\n"
"* Is only used offline, in an air-gapped Tails only communicating with\n"
" the outside world through:\n"
" - Plugging the Tails flash media in another operating system to install "
"Tails\n"
" - Plugging the Tails flash media in another operating system to install Tails\n"
" in the first place.\n"
" - Plugging other removable media in the air-gapped Tails to send the\n"
" public key, secret key stubs, parts of the secret master key, and so "
"on\n"
" public key, secret key stubs, parts of the secret master key, and so on\n"
" to the outside world.\n"
" - Plugging other removable media in the air-gapped Tails to receive "
"Debian\n"
" - Plugging other removable media in the air-gapped Tails to receive Debian\n"
" packages, public keys, and so on from the outside world.\n"
"* Expires in less than one year. We will extend its validity as many\n"
" times as we find reasonable.\n"
......@@ -242,15 +236,16 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" pub rsa4096/0xDBB802B258ACD84F 2015-01-18 [C] [expires: 2018-01-11]\n"
" Key fingerprint = A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC "
"D84F\n"
" uid [ full ] Tails developers (offline long-term "
"identity key) <tails@boum.org>\n"
" pub rsa4096/0xDBB802B258ACD84F 2015-01-18 [C] [expires: 2019-01-11]\n"
" Key fingerprint = A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F\n"
" uid [ full ] Tails developers (offline long-term identity key) <tails@boum.org>\n"
" uid [ unknown] Tails developers <tails@boum.org>\n"
" sub rsa4096/0x98FEC6BC752A3DB6 2015-01-18 [S] [expires: 2018-01-11]\n"
" sub rsa4096/0x3C83DCB52F699C56 2015-01-18 [S] [expires: 2018-01-11]\n"
" sub rsa4096/0xAF292B44A0EDAA41 2016-08-30 [S] [expires: 2018-01-11]\n"
" sub rsa4096/0xD21DAD38AF281C0B 2017-08-28 [S] [expires: 2019-01-11]\n"
" sub rsa4096/0x3020A7A9C2B72733 2017-08-28 [S] [expires: 2019-01-11]\n"
" sub ed25519/0x90B2B4BD7AED235F 2017-08-28 [S] [expires: 2019-01-11]\n"
msgstr ""
#. type: Bullet: ' - '
......@@ -279,29 +274,25 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"Use this key to encrypt private support requests sent to "
"[[tails-support-private@boum.org|about/contact#tails-support-private]]."
"Use this key to encrypt private support requests sent to [[tails-support-"
"private@boum.org|about/contact#tails-support-private]]."
msgstr ""
#. type: Bullet: ' - '
msgid ""
"This same key is used to handle [[*WhisperBack* "
"reports|first_steps/bug_reporting]]."
"This same key is used to handle [[*WhisperBack* reports|first_steps/"
"bug_reporting]]."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" pub 4096R/EC57B56EF0C43132 2013-07-24 [expires: 2018-07-23]\n"
" Key fingerprint = 1F56 EDD3 0741 0480 35DA C1C5 EC57 B56E F0C4 "
"3132\n"
" Key fingerprint = 1F56 EDD3 0741 0480 35DA C1C5 EC57 B56E F0C4 3132\n"
" uid Tails bug squad <tails-bugs@boum.org>\n"
" uid Tails bug squad (schleuder list) "
"<tails-bugs-owner@boum.org>\n"
" uid Tails bug squad (schleuder list) "
"<tails-bugs-request@boum.org>\n"
" uid Tails private user support "
"<tails-support-private@boum.org>\n"
" uid Tails bug squad (schleuder list) <tails-bugs-owner@boum.org>\n"
" uid Tails bug squad (schleuder list) <tails-bugs-request@boum.org>\n"
" uid Tails private user support <tails-support-private@boum.org>\n"
" sub 4096R/9D6D6472AFC1AD77 2013-07-24 [expires: 2018-07-23]\n"
msgstr ""
......@@ -321,8 +312,8 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"Use this key to encrypt private emails sent to "
"[[tails-press@boum.org|about/contact#tails-press]]."
"Use this key to encrypt private emails sent to [[tails-press@boum.org|about/"
"contact#tails-press]]."
msgstr ""
#. type: Plain text
......@@ -330,12 +321,9 @@ msgstr ""
msgid ""
" pub 4096R/0x457080B5A072CBE3 2014-07-11\n"
" Key fingerprint = F3CD 9B7B 4BDF 9995 DA22 088E 4570 80B5 A072 CBE3\n"
"\tuid Tails press team (schleuder list) "
"<tails-press@boum.org>\n"
"\tuid Tails press team (schleuder list) "
"<tails-press-owner@boum.org>\n"
"\tuid Tails press team (schleuder list) "
"<tails-press-request@boum.org>\n"
"\tuid Tails press team (schleuder list) <tails-press@boum.org>\n"
"\tuid Tails press team (schleuder list) <tails-press-owner@boum.org>\n"
"\tuid Tails press team (schleuder list) <tails-press-request@boum.org>\n"
"\tsub 4096R/0x5748DE3BC338BFFC 2014-07-11\n"
msgstr ""
......@@ -355,8 +343,8 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"Use this key to encrypt private emails sent to "
"[[tails-accounting@boum.org|about/contact#tails-acccounting]]."
"Use this key to encrypt private emails sent to [[tails-accounting@boum.org|"
"about/contact#tails-acccounting]]."
msgstr ""
#. type: Plain text
......@@ -364,12 +352,9 @@ msgstr ""
msgid ""
"\tpub 4096R/0xC436090F4BB47C6F 2014-07-11\n"
"\tKey fingerprint = 256D EB90 7788 0CD6 8167 8528 C436 090F 4BB4 7C6F\n"
"\tuid Tails accounting team (schleuder list) "
"<tails-accounting@boum.org>\n"
"\tuid Tails accounting team (schleuder list) "
"<tails-accounting-request@boum.org>\n"
"\tuid Tails accounting team (schleuder list) "
"<tails-accounting-owner@boum.org>\n"
"\tuid Tails accounting team (schleuder list) <tails-accounting@boum.org>\n"
"\tuid Tails accounting team (schleuder list) <tails-accounting-request@boum.org>\n"
"\tuid Tails accounting team (schleuder list) <tails-accounting-owner@boum.org>\n"
"\tsub 4096R/0x289A5B45A9E89475 2014-07-11\n"
msgstr ""
......@@ -391,22 +376,18 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"Use this key to encrypt private emails sent to "
"[[tails-mirrors@boum.org|about/contact#tails-mirrors]]."
"Use this key to encrypt private emails sent to [[tails-mirrors@boum.org|"
"about/contact#tails-mirrors]]."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"\tpub rsa4096/0xD2EDA621B572DD73 2016-04-29 [SCEA]\n"
"\t Key fingerprint = 0B08 8E31 D4F8 E59A 3D39 9137 D2ED A621 B572 "
"DD73\n"
"\tuid [ unknown] Tails mirror pool managers (schleuder "
"list) <tails-mirrors@boum.org>\n"
"\tuid [ unknown] Tails mirror pool managers (schleuder "
"list) <tails-mirrors-request@boum.org>\n"
"\tuid [ unknown] Tails mirror pool managers (schleuder "
"list) <tails-mirrors-owner@boum.org>\n"
"\t Key fingerprint = 0B08 8E31 D4F8 E59A 3D39 9137 D2ED A621 B572 DD73\n"
"\tuid [ unknown] Tails mirror pool managers (schleuder list) <tails-mirrors@boum.org>\n"
"\tuid [ unknown] Tails mirror pool managers (schleuder list) <tails-mirrors-request@boum.org>\n"
"\tuid [ unknown] Tails mirror pool managers (schleuder list) <tails-mirrors-owner@boum.org>\n"
"\tsub rsa4096/0x3DCFC1EB1C62C73C 2016-04-29 [SEA]\n"
msgstr ""
......@@ -426,8 +407,8 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"Use this key to encrypt private emails sent to "
"[[tails-sysadmins@boum.org|about/contact#tails-sysadmins]]."
"Use this key to encrypt private emails sent to [[tails-sysadmins@boum.org|"
"about/contact#tails-sysadmins]]."
msgstr ""
#. type: Plain text
......@@ -435,12 +416,9 @@ msgstr ""
msgid ""
" pub 4096R/0x70F4F03116525F43 2012-08-23 [expires: 2018-05-16]\n"
" Key fingerprint = D113 CB6D 5131 D34B A5F0 FE9E 70F4 F031 1652 5F43\n"
" uid Tails system administrators "
"<tails-sysadmins@boum.org>\n"
" uid Tails system administrators (schleuder list) "
"<tails-sysadmins-owner@boum.org>\n"
" uid Tails system administrators (schleuder list) "
"<tails-sysadmins-request@boum.org>\n"
" uid Tails system administrators <tails-sysadmins@boum.org>\n"
" uid Tails system administrators (schleuder list) <tails-sysadmins-owner@boum.org>\n"
" uid Tails system administrators (schleuder list) <tails-sysadmins-request@boum.org>\n"
" sub 4096R/0x58BA940CCA0A30B4 2012-08-23 [expires: 2018-05-16]\n"
msgstr ""
......
......@@ -6,11 +6,12 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2018-02-04 07:50+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Bullet: '1. '
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2017-06-29 12:53+0000\n"
"POT-Creation-Date: 2018-02-04 10:28+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -18,17 +18,26 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
"When <span class=\"application\">Tails Greeter</span> appears, in the <span "
"class=\"guilabel\">Welcome to Tails</span> window, click on the <span "
"class=\"button\">Yes</span> button. Then click on the <span "
"class=\"button\">Forward</span> button."
"When <span class=\"application\">Tails Greeter</span> appears, click on the "
"<span class=\"button\">[[!img lib/list-add.png alt=\"Expand\" class="
"\"symbolic\" link=\"no\"]]</span> button."
msgstr ""
#. type: Plain text
#, no-wrap
msgid " [[!img additional.png link=\"no\" alt=\"Additional settings of Tails Greeter\"]]\n"
msgstr ""
#. type: Bullet: '2. '
msgid ""
"In the <span class=\"guilabel\">Network configuration</span> section, select "
"the following option: <span class=\"guilabel\">This computer's Internet "
"connection is censored, filtered, or proxied.</span>"
"When the <span class=\"guilabel\">Additional Settings</span> dialog appears, "
"click on <span class=\"guilabel\">Network Configuration</span>."
msgstr ""
#. type: Bullet: '3. '
msgid ""
"Select the <span class=\"guilabel\">Configure a Tor bridge or local proxy</"
"span> option."
msgstr ""
#. type: Plain text
......
......@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: Tails\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2018-01-30 12:41+0000\n"
"PO-Revision-Date: 2018-01-31 19:18+0000\n"
"PO-Revision-Date: 2018-02-03 23:38+0000\n"
"Last-Translator: emmapeel <emma.peel@riseup.net>\n"
"Language-Team: Spanish "
"<http://translate.tails.boum.org/projects/tails/index/es/>\n"
......@@ -23,6 +23,8 @@ msgid ""
"[[!meta title=\"Privacy for anyone anywhere\"]] [[!meta google-site-"
"verification=\"aGp--gO0AaDbtxshkcWaS0jY8WkOjYwUuBqRWzWHy6o\"]]"
msgstr ""
"[[!meta title=\"Privacidad para todos en todas partes\"]] [[!meta google-"
"site-verification=\"aGp--gO0AaDbtxshkcWaS0jY8WkOjYwUuBqRWzWHy6o\"]]"
#. type: Content of: <div><p>
msgid ""
......@@ -158,27 +160,33 @@ msgstr "<span class=\"clearfix\"></span>"
#. type: Content of: <div><h1>
msgid "Awards"
msgstr ""
msgstr "Premios"
#. type: Content of: <div><p>
msgid ""
"Tails has received the Mozilla Open Source Support Award (2016), the Access "
"Innovation Prize (2014) and the OpenITP award (2013)."
msgstr ""
"Tails ha recibido el Mozilla Open Source Support Award (2016), el Access "
"Innovation Prize (2014) y el OpenITP award (2013)."
#. type: Content of: <div><h1>
msgid "Partners & Grants"
msgstr ""
msgstr "Partners y subvenciones"
#. type: Content of: <div><p>
msgid ""
"Tails receives grants, corporate donations, and substantial donations from "
"individuals."
msgstr ""
"Tails recibe subvenciones, donaciones corporativas y bastantes donaciones "
"individuales."
#. type: Content of: <div><p>
msgid "[[Meet our partners|partners]] or [[become a partner|partners/become]]!"
msgstr ""
"[[Conoce a nuestros partners|partners]] o [[deviene partner tú "
"mismo/a|partners/become]]!"
#~ msgid "[[!meta title=\"Privacy for anyone anywhere\"]]"
#~ msgstr "[[!meta title=\"Privacidad para todos en cualquier sitio\"]]"
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2017-06-29 12:53+0000\n"
"POT-Creation-Date: 2018-02-04 10:28+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -17,19 +17,21 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: outside any tag (error?)
msgid "[[!meta title=\"Privacy for anyone anywhere\"]]"
msgid ""
"[[!meta title=\"Privacy for anyone anywhere\"]] [[!meta google-site-"
"verification=\"aGp--gO0AaDbtxshkcWaS0jY8WkOjYwUuBqRWzWHy6o\"]]"
msgstr ""
#. type: Content of: <div><p>
msgid ""
"Tails is a [[!wikipedia desc=\"live operating system\" Live_USB]] that you "
"can start on almost any computer from a DVD, USB stick, or SD card."
"can start on almost any computer from a USB stick or a DVD."
msgstr ""
#. type: Content of: <div><p>
msgid ""
"It aims at preserving your <strong>privacy</strong> and "
"<strong>anonymity</strong>, and helps you to:"
"It aims at preserving your <strong>privacy</strong> and <strong>anonymity</"