Commit 4e02dc63 authored by xin's avatar xin
Browse files

Merge remote-tracking branch 'origin' into translate/3.13

parents ecc1f3c7 91a3d74f
[[!meta title="Agenda for the next contributors meeting"]]
See also:
* [[place, date, and other documentation about these meetings|contribute/meetings]]
* the [[minutes of past meetings|contribute/meetings]]
* [See all open discuss tickets](https://labs.riseup.net/code/projects/tails/issues?query_id=114)
Availability and plans for the next weeks
=========================================
- Volunteers to handle "[Hole in the
roof](https://labs.riseup.net/code/versions/198)" tickets this
month
- Volunteers to handle important tickets flagged for next release,
but without assignee
- Availability and plans until the next meeting
- Important missing bits in the next [[monthly report|blueprint/monthly_report]].
Discussions
===========
[[Prepare a discussion|contribute/meetings#preparing-a-discussion]]
and add your topic here:
- [[!tails_ticket 15895 desc="#15895: Remove some of our predefined bookmarks"]]
- Replace monthly meeting by weekly standup meeting. [u: I can't attend
the meeting today, but all my ideas are in the email you've seen and
I'd be happy to read your thoughts.]
Roles
=====
For each meeting, we need a notetaker and a facilitator. They should
designate themselves beforehand.
2019:
| Month | Notetaker | Facilitator |
| -------------- | -------------- |------------ |
| January 2019 | canceled | canceled |
| February 2019 | | |
| March 2019 | | |
| April 2019 | | |
| May 2019 | | |
| June 2019 | | |
2018:
| Month | Notetaker | Facilitator |
| -------------- | -------------- | ------------ |
| January 2018 | intrigeri | mercedes508 |
| February 2018 | anonym | sajolida |
| March 2018 | anonym | intrigeri |
| April 2018 | u | anonym |
| May 2018 | sajolida | segfault |
| June 2018 | intrigeri | u |
| July 2018 | sajolida | u |
| August 2018 | sajolida | segfault |
| September 2018 | muri | intrigeri |
| October 2018 | | u |
| November 2018 | canceled | canceled |
| December 2018 | muri | intrigeri |
......@@ -3,11 +3,6 @@
This living document reflects the current state of the thinking
process, within the Tails project, about our mission and goals.
You can
[[prepare and propose|contribute/meetings#preparing-a-discussion]]
a discussion about a strategic planning topic for the
[[contributors meeting|contribute/meetings]].
[[!toc levels=2]]
# How to read this document
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2019-02-25 06:09+0000\n"
"POT-Creation-Date: 2019-03-18 20:08+0000\n"
"PO-Revision-Date: 2014-04-18 23:25+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -642,13 +642,6 @@ msgid "[[Social contract|contribute/working_together/social_contract]]"
msgstr ""
"[[Fortschritte dokumentieren|contribute/working_together/document_progress]]"
#. type: Bullet: ' - '
#, fuzzy
#| msgid "[[Meetings|contribute/meetings]], and minutes from past meetings"
msgid ""
"[[Contributors meetings|contribute/meetings]], and minutes from past meetings"
msgstr "[[Treffen|contribute/meetings]] und Protokolle vergangener Treffen"
#. type: Bullet: ' - '
msgid ""
"[[Sponsorship to attend events|contribute/sponsorship_to_attend_events]]"
......@@ -718,5 +711,12 @@ msgid ""
"lists|about/contact]]."
msgstr ""
#, fuzzy
#~| msgid "[[Meetings|contribute/meetings]], and minutes from past meetings"
#~ msgid ""
#~ "[[Contributors meetings|contribute/meetings]], and minutes from past "
#~ "meetings"
#~ msgstr "[[Treffen|contribute/meetings]] und Protokolle vergangener Treffen"
#~ msgid "[[Blueprints|blueprint]]"
#~ msgstr "[[Entwürfe|blueprint]]"
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2019-02-25 06:09+0000\n"
"POT-Creation-Date: 2019-03-18 20:08+0000\n"
"PO-Revision-Date: 2018-02-11 09:57+0000\n"
"Last-Translator: emmapeel <emma.peel@riseup.net>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
......@@ -615,13 +615,6 @@ msgstr "[[Código de conducta|contribute/working_together/code_of_conduct]]"
msgid "[[Social contract|contribute/working_together/social_contract]]"
msgstr "[[Contrato social|contribute/working_together/social_contract]]"
#. type: Bullet: ' - '
msgid ""
"[[Contributors meetings|contribute/meetings]], and minutes from past meetings"
msgstr ""
"[[Reuniones de colaboradores|contribute/meetings]], y actas de reuniones "
"pasadas"
#. type: Bullet: ' - '
msgid ""
"[[Sponsorship to attend events|contribute/sponsorship_to_attend_events]]"
......@@ -698,6 +691,13 @@ msgstr ""
"Para hablar con otros colaboradores de Tails suscríbete a [[nuestra lista de "
"correo|about/contact]]."
#~ msgid ""
#~ "[[Contributors meetings|contribute/meetings]], and minutes from past "
#~ "meetings"
#~ msgstr ""
#~ "[[Reuniones de colaboradores|contribute/meetings]], y actas de reuniones "
#~ "pasadas"
#~ msgid "[[Blueprints|blueprint]]"
#~ msgstr "[[Blueprints|blueprint]]"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2019-02-25 06:09+0000\n"
"POT-Creation-Date: 2019-03-18 20:08+0000\n"
"PO-Revision-Date: 2015-10-15 15:23+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
......@@ -627,11 +627,6 @@ msgstr "[[مرام‌نامه|contribute/working_together/code_of_conduct]]"
msgid "[[Social contract|contribute/working_together/social_contract]]"
msgstr "[[مرام‌نامه|contribute/working_together/code_of_conduct]]"
#. type: Bullet: ' - '
msgid ""
"[[Contributors meetings|contribute/meetings]], and minutes from past meetings"
msgstr "[[جلسات کمک‌کنندگان|contribute/meetings]] و خلاصهٔ جلسات پیشین"
#. type: Bullet: ' - '
msgid ""
"[[Sponsorship to attend events|contribute/sponsorship_to_attend_events]]"
......@@ -701,6 +696,11 @@ msgid ""
"lists|about/contact]]."
msgstr ""
#~ msgid ""
#~ "[[Contributors meetings|contribute/meetings]], and minutes from past "
#~ "meetings"
#~ msgstr "[[جلسات کمک‌کنندگان|contribute/meetings]] و خلاصهٔ جلسات پیشین"
#~ msgid "[[Blueprints|blueprint]]"
#~ msgstr "[[نقشه‌های ساخت|blueprint]]"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2019-02-25 06:09+0000\n"
"POT-Creation-Date: 2019-03-18 20:08+0000\n"
"PO-Revision-Date: 2019-02-03 13:45+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
......@@ -599,12 +599,6 @@ msgstr "[[Code of conduct|contribute/working_together/code_of_conduct]]"
msgid "[[Social contract|contribute/working_together/social_contract]]"
msgstr "[[Social contract|contribute/working_together/social_contract]]"
#. type: Bullet: ' - '
msgid ""
"[[Contributors meetings|contribute/meetings]], and minutes from past meetings"
msgstr ""
"[[Contributors meetings|contribute/meetings]], and minutes from past meetings"
#. type: Bullet: ' - '
msgid ""
"[[Sponsorship to attend events|contribute/sponsorship_to_attend_events]]"
......@@ -679,3 +673,10 @@ msgid ""
msgstr ""
"Pour discuter avec d'autres personnes contribuant à Tails, inscrivez-vous "
"aux [[listes de discussion correspondantes|about/contact]]."
#~ msgid ""
#~ "[[Contributors meetings|contribute/meetings]], and minutes from past "
#~ "meetings"
#~ msgstr ""
#~ "[[Contributors meetings|contribute/meetings]], and minutes from past "
#~ "meetings"
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2019-02-25 06:09+0000\n"
"POT-Creation-Date: 2019-03-18 20:08+0000\n"
"PO-Revision-Date: 2018-12-02 09:46+0000\n"
"Last-Translator: Davide <davidesantoro@mail.ru>\n"
"Language-Team: ita <transitails@inventati.org>\n"
......@@ -491,11 +491,6 @@ msgstr ""
msgid "[[Social contract|contribute/working_together/social_contract]]"
msgstr ""
#. type: Bullet: ' - '
msgid ""
"[[Contributors meetings|contribute/meetings]], and minutes from past meetings"
msgstr ""
#. type: Bullet: ' - '
msgid ""
"[[Sponsorship to attend events|contribute/sponsorship_to_attend_events]]"
......
......@@ -206,7 +206,6 @@ Collective process
- [[Calendar|contribute/calendar]] of releases, meetings, working sessions, etc.
- [[Code of conduct|contribute/working_together/code_of_conduct]]
- [[Social contract|contribute/working_together/social_contract]]
- [[Contributors meetings|contribute/meetings]], and minutes from past meetings
- [[Sponsorship to attend events|contribute/sponsorship_to_attend_events]]
- [[Marking a task as Starter|contribute/working_together/criteria_for_starter_tasks]]
- [[Document progress|contribute/working_together/document_progress]]
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2019-02-25 06:09+0000\n"
"POT-Creation-Date: 2019-03-18 20:08+0000\n"
"PO-Revision-Date: 2018-02-21 11:59+0000\n"
"Last-Translator: drebs <drebs@riseup.net>\n"
"Language-Team: Portuguese <LL@li.org>\n"
......@@ -630,13 +630,6 @@ msgstr "[[Código de conduta|contribute/working_together/code_of_conduct]]"
msgid "[[Social contract|contribute/working_together/social_contract]]"
msgstr "[[Contrato social|contribute/working_together/social_contract]]"
#. type: Bullet: ' - '
msgid ""
"[[Contributors meetings|contribute/meetings]], and minutes from past meetings"
msgstr ""
"[[Reuniões de contribuidores|contribute/meetings]], e notas de reuniões "
"passadas"
#. type: Bullet: ' - '
msgid ""
"[[Sponsorship to attend events|contribute/sponsorship_to_attend_events]]"
......@@ -728,6 +721,13 @@ msgstr ""
"Para falar com outras pessoas que contribuem com o Tails, inscreva-se na "
"[[lista de emails específica para isso|about/contact]]."
#~ msgid ""
#~ "[[Contributors meetings|contribute/meetings]], and minutes from past "
#~ "meetings"
#~ msgstr ""
#~ "[[Reuniões de contribuidores|contribute/meetings]], e notas de reuniões "
#~ "passadas"
#~ msgid "[[Blueprints|blueprint]]"
#~ msgstr "[[Projetos|blueprint]]"
......
......@@ -172,10 +172,6 @@ Carefully check the `.changes` file (especially the `Distribution`
control field, and the included files list; the former can be fixed
with the `changestool(1)` command, from [[!debpkg reprepro]]).
Remove all `buildinfo` and `dbgsym` lines from the `.changes` file.
XXX: still needed? We now run reprepro from Stretch, that supports
both in theory.
If the `.orig.tar.{gz,bz2,xz}` tarball is present neither in the
`.changes` file nor in our custom APT repository, add it using:
......
......@@ -4,14 +4,6 @@ All times are referenced to Berlin and Paris time.
## 2019Q1
* 2019-03-17:
- Feature Freeze: Unless I have told you otherwise, all feature branches
targeting Tails 3.13 should be merged into the `stable` branch by
noon, CET. Ask if you need an exception!
- Start preparing Tails 3.13.
* 2019-03-18: build and upload Tails 3.13.
* 2019-03-19: Test and **release Tails 3.13** (kibi is the RM)
* 2019-03-20 to 2019-03-22: [[!wikipedia Pwn2Own]], which often triggers an emergency Firefox release
......@@ -19,51 +11,31 @@ All times are referenced to Berlin and Paris time.
* 2019-04-02 to 2019-04-05: [[Foundations Team|contribute/working_together/roles/foundations_team]] sprint
- Port Tails to Debian 10 (Buster)
* 2019-04-03, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
- [smallish UX improvements](https://redmine.tails.boum.org/code/issues/14544#note-75)
* 2019-04-03, 19:00: [[Contributors meeting|contribute/meetings]]
* 2019-05-06, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
* 2019-05-06, 19:00: [[Contributors meeting|contribute/meetings]]
- [smallish UX improvements](https://redmine.tails.boum.org/code/issues/14544#note-75)
* 2019-05-14: **Release 3.14** (Firefox 60.7, Tor Browser 8.5; bugfix release — kibi is the RM)
* 2019-06-03, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
* 2019-06-03, 19:00: [[Contributors meeting|contribute/meetings]]
* 2019-06-25 to 2019-06-27: Translation platform sprint
* 2019-07-03, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
* 2019-07-03, 19:00: [[Contributors meeting|contribute/meetings]]
* 2019-07-09: **Release 3.15** (Firefox 60.8, bugfix release — kibi is the RM)
* 2019-08-06, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
* 2019-08-06, 19:00: [[Contributors meeting|contribute/meetings]]
* 2019-09-03, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
* 2019-09-03, 19:00: [[Contributors meeting|contribute/meetings]]
* 2019-09-03: **Release 3.16** (Firefox 60.9, bugfix release — intrigeri is the RM)
* 2019-10-03, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
* 2019-10-03, 19:00: [[Contributors meeting|contribute/meetings]]
* 2019-10-22: **Release 3.17 or 4.0** (Firefox 68.2, major release)
* 2019-11-06, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
* 2019-11-06, 19:00: [[Contributors meeting|contribute/meetings]]
* 2019-12-03, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
* 2019-12-03, 19:00: [[Contributors meeting|contribute/meetings]]
* 2019-12-10: **Release** (Firefox 68.3, bugfix release)
......@@ -65,18 +65,31 @@ See the list of [[long-standing issues|support/known_issues]].
# Get Tails $VERSION
- To install, follow our [[installation instructions|install]].
## To upgrade your Tails USB stick and keep your persistent storage
- To upgrade, automatic upgrades are available from $VERSION-2, $VERSION-1, and $VERSION-1~rc1 to $VERSION.
- Automatic upgrades are available from $VERSION-2, $VERSION-1, and $VERSION-1~rc1 to $VERSION.
XXX: Check which IUK will be available with:
git diff origin/master...origin/web/release-$VERSION wiki/src/upgrade/v1/Tails | grep "to_$VERSION"
If you cannot do an automatic upgrade or if Tails fails to start after an
- If you cannot do an automatic upgrade or if Tails fails to start after an
automatic upgrade, please try to do a [[manual upgrade|upgrade]].
- Download Tails $VERSION:
## To install Tails on a new USB stick
Follow our installation instructions:
- [[Install from Windows|install/win]]
- [[Install from macOS|install/mac]]
- [[Install from Linux|install/linux]]
<div class="caution"><p>All the data on this USB stick will be lost.</p></div>
## To download only
If you don't need installation or upgrade instructions, you can directly download
Tails $VERSION:
- [[For USB sticks (USB image)|install/download]]
- [[For DVDs and virtual machines (ISO image)|install/download-iso]]
......
[[!meta title="Contributors meetings"]]
[[!toc]]
Each month Tails contributors gather for an online meeting in which
everybody is welcome to attend: existing contributors and those who want
to become one.
- **Date**:
- The **3rd** day of the month if it's a day between Monday and
Thursday (inclusive)
- The **6th** day of the month otherwise
- **Time**: 19:00 Berlin time (17:00 or 18:00 UTC, depending on the date)
- **Location**: [[`tails-dev` XMPP chatroom|contribute/chat]]
If you want to get involved but don't know yet how, please introduce
yourself during the meeting, and be sure to tell us what you are
interested in.
The meeting might not be the most adequate time and place to properly
introduce newcomers to the development process, but at least it should
be a fine place to know each other, and schedule a better suited event.
<a id="preparing-a-discussion"></a>
# Preparing a discussion
To have fruitful discussions we prepare them to make sure that:
- The meeting is the right place for a given discussion; otherwise it
should be redirected to mailing lists or Redmine.
- Enough information is available; especially if a decision has to be
made.
- The required people or skills are present.
- The discussion is lead in a fruitful way.
Discussions with no assignee will be postponed.
## Discussion about a Redmine ticket
If you want to propose a discussion about
a [[Redmine|contribute/working_together/Redmine]] ticket:
- Make sure that it corresponds to a ticket with:
- *Discuss* as its *Type of Work*
- You as its *Assignee*
- Detailed enough information on the ticket
- Add it to the [[blueprint of the agenda|blueprint/monthly_meeting]].
## Discussion about a strategic planning topic
If you want to propose a discussion about a strategic planning topic:
- Make sure it is marked *Needs discussion* on our
[[blueprint/Strategic planning]] living document.
- Prepare yourself for facilitating this discussion:
- Think about how you will structure the discussion.
- The
[Facilitating consensus in Virtual Meetings](https://www.seedsforchange.org.uk/virtualmtg)
guide is a good resource to get started.
- Add it to the [[blueprint of the agenda|blueprint/monthly_meeting]].
<a id="notes"></a>
# Instructions for taking notes
- Store a full log of the meeting along in attachment to your minutes.
See for example [[201707/logs.txt|201707/logs.txt]].
- Explain the decision (being as brief as possible saves you work and
makes better notes):
- Explain in details the decisions that were taken rather than the
discussion that lead to them (they are in the logs anyway).
- Summarize the discussion only if no decision was taken.
- Include names of people who took responsibilities.
- Update Redmine tickets:
- Copy the meeting notes in a comment on the ticket and point to the
notes.
- Update the ticket if needed (unless someone else volunteers to do
it).
- Remove all topics that don't require further discussion from the
[[blueprint of the agenda|blueprint/monthly_meeting]].
# Meeting minutes
[[!inline pages="page(contribute/meetings/*)" template="titlepage" sort="-title" limit="0"]]
......@@ -892,21 +892,20 @@ Prepare upgrade-description files
git push origin ${WEBSITE_RELEASE_BRANCH:?} \
)
1. If preparing anything but a final release (e.g. an alpha, beta
or RC), copy the generated UDFs for the previous releases
to the *test* channel in `$MASTER_CHECKOUT`, modify their content
accordingly, sign them, commit and push:
1. Copy the generated UDFs for the previous releases to the *test*
channel in `$MASTER_CHECKOUT`, modify their content accordingly,
sign them, commit and push:
( \
cd ${MASTER_CHECKOUT:?} && \
git fetch && \
git merge origin/master && \
for old_version in $(echo ${IUK_SOURCE_VERSIONS:?}); do
alpha_udf="wiki/src/upgrade/v1/Tails/${old_version:?}/amd64/alpha/upgrades.yml" && \
release_udf="wiki/src/upgrade/v1/Tails/${old_version:?}/amd64/${DIST:?}/upgrades.yml" && \
test_udf="wiki/src/upgrade/v1/Tails/${old_version:?}/amd64/test/upgrades.yml" && \
mkdir -p "$(dirname "$test_udf")" && \
git show origin/${WEBSITE_RELEASE_BRANCH:?}:${alpha_udf:?} \
| sed -e 's/channel: alpha/channel: test/' > ${test_udf:?} && \
git show origin/${WEBSITE_RELEASE_BRANCH:?}:${release_udf:?} \
| sed -e "s/channel: ${DIST:?}/channel: test/" > ${test_udf:?} && \
gpg -u "${TAILS_SIGNATURE_KEY:?}" --armor --detach-sign ${test_udf:?} && \
mv ${test_udf:?}.asc ${test_udf:?}.pgp && \
git add ${test_udf:?}* ; \
......@@ -915,28 +914,6 @@ Prepare upgrade-description files
git push origin master:master \
)
1. Else, if preparing a final release, copy the generated UDFs for the previous
releases to the *test* channel in `$MASTER_CHECKOUT`, modify their content
accordingly, sign them, commit and push:
( \
cd ${MASTER_CHECKOUT:?} && \
git fetch && \
for old_version in $(echo ${IUK_SOURCE_VERSIONS:?}); do
stable_udf="wiki/src/upgrade/v1/Tails/${old_version:?}/amd64/stable/upgrades.yml" && \
test_udf="wiki/src/upgrade/v1/Tails/${old_version:?}/amd64/test/upgrades.yml" && \
mkdir -p "$(dirname "$test_udf")" && \
git show origin/${WEBSITE_RELEASE_BRANCH:?}:${stable_udf:?} \
| sed -e 's/channel: stable/channel: test/' > ${test_udf:?} && \
gpg -u "${TAILS_SIGNATURE_KEY:?}" --armor --detach-sign ${test_udf:?} && \
mv ${test_udf:?}.asc ${test_udf:?}.pgp && \
git add ${test_udf:?}* ; \
done && \
git commit -m "Add incremental upgrades on the test channel for Tails ${VERSION:?}" && \
git push origin master:master \
)
Prepare the image description file for *Tails Verification*
-----------------------------------------------------------
......@@ -956,8 +933,8 @@ Update the image description file (IDF) used by the browser extension:
Done with OpenPGP signing
=========================
By now you are done with Tails signing key, so please make sure it is
not usable by your system any more.
Unplug your OpenPGP smartcard and store it away, so you don't plug it
back semi-mechanically later on.
**Beware!** If your have to plug your OpenPGP smart card or reassemble the
key again after this point it invalidates *everything* done for
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2018-06-25 18:11+0200\n"
"POT-Creation-Date: 2019-03-19 18:48+0000\n"
"PO-Revision-Date: 2015-11-21 20:44+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
......@@ -103,6 +103,22 @@ msgid ""
"blog/ultimate-guide-bitcoin/)."
msgstr ""
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "<div class=\"caution\">\n"
msgid "<div class=\"bug\">\n"
msgstr "<div class=\"tip\">\n"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/anonymous_internet/electrum/phishing.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "</div>\n"
msgstr "</div>\n"
#. type: Plain text
#, no-wrap
msgid "<div class=\"caution\">\n"
......@@ -131,11 +147,6 @@ msgstr ""
"<p>Um es schwieriger zu machen, Ihre einzelnen Überweisungen in Beziehung zueinander zu bringen,\n"
"sollten Sie für jede Transaktion verschiedene Empfangsadressen verwenden.</p>\n"
#. type: Plain text
#, no-wrap
msgid "</div>\n"
msgstr "</div>\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "<div class=\"caution\">\n"
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2018-06-25 18:11+0200\n"
"POT-Creation-Date: 2019-03-19 18:48+0000\n"
"PO-Revision-Date: 2018-04-08 10:56+0000\n"
"Last-Translator: Tails translators <amnesia@boum.org>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
......@@ -77,6 +77,22 @@ msgid ""
"blog/ultimate-guide-bitcoin/)."
msgstr ""
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "<div class=\"tip\">\n"
msgid "<div class=\"bug\">\n"
msgstr "<div class=\"tip\">\n"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/anonymous_internet/electrum/phishing.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "</div>\n"
msgstr "</div>\n"
#. type: Plain text
#, no-wrap
msgid "<div class=\"caution\">\n"
......@@ -100,11 +116,6 @@ msgid ""
"addresses for you to use.</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "</div>\n"
msgstr "</div>\n"