Unverified Commit f33202a2 authored by intrigeri's avatar intrigeri
Browse files

Merge remote-tracking branch 'origin/web/release-4.18'

parents 35b0e892 1a10293f
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -84,7 +84,6 @@ apt-get -y install \ ...@@ -84,7 +84,6 @@ apt-get -y install \
debootstrap \ debootstrap \
dosfstools \ dosfstools \
dpkg-dev \ dpkg-dev \
faketime \
gdisk \ gdisk \
gettext \ gettext \
gir1.2-udisks-2.0 \ gir1.2-udisks-2.0 \
......
...@@ -23,7 +23,6 @@ as_root_do() { ...@@ -23,7 +23,6 @@ as_root_do() {
${APT_SNAPSHOTS_SERIALS:+APT_SNAPSHOTS_SERIALS="${APT_SNAPSHOTS_SERIALS}"} \ ${APT_SNAPSHOTS_SERIALS:+APT_SNAPSHOTS_SERIALS="${APT_SNAPSHOTS_SERIALS}"} \
${TAILS_WEBSITE_CACHE:+TAILS_WEBSITE_CACHE="${TAILS_WEBSITE_CACHE}"} \ ${TAILS_WEBSITE_CACHE:+TAILS_WEBSITE_CACHE="${TAILS_WEBSITE_CACHE}"} \
${WEBSITE_CACHE_BASEDIR:+WEBSITE_CACHE_BASEDIR="${WEBSITE_CACHE_BASEDIR}"} \ ${WEBSITE_CACHE_BASEDIR:+WEBSITE_CACHE_BASEDIR="${WEBSITE_CACHE_BASEDIR}"} \
${TAILS_MERGE_BASE_BRANCH:+TAILS_MERGE_BASE_BRANCH="${TAILS_MERGE_BASE_BRANCH}"} \
${GIT_COMMIT:+GIT_COMMIT="${GIT_COMMIT}"} \ ${GIT_COMMIT:+GIT_COMMIT="${GIT_COMMIT}"} \
${GIT_REF:+GIT_REF="${GIT_REF}"} \ ${GIT_REF:+GIT_REF="${GIT_REF}"} \
${BASE_BRANCH_GIT_COMMIT:+BASE_BRANCH_GIT_COMMIT="${BASE_BRANCH_GIT_COMMIT}"} \ ${BASE_BRANCH_GIT_COMMIT:+BASE_BRANCH_GIT_COMMIT="${BASE_BRANCH_GIT_COMMIT}"} \
......
...@@ -49,6 +49,7 @@ Then: ...@@ -49,6 +49,7 @@ Then:
libvirt-daemon-system \ libvirt-daemon-system \
dnsmasq-base \ dnsmasq-base \
ebtables \ ebtables \
faketime \
pigz \ pigz \
qemu-system-x86 \ qemu-system-x86 \
qemu-utils \ qemu-utils \
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* We have one main communication channel: A [mailing list](https://www.autistici.org/mailman/listinfo/tails-l10n-spanish) * We have one main communication channel: A [mailing list](https://www.autistici.org/mailman/listinfo/tails-l10n-spanish)
(<tails-l10n-spanish@boum.org>). (<tails-l10n-spanish@boum.org>).
* We have a wiki: [[!tails_blueprint l10n_Spanish]]. * We have a wiki: [[!tails_blueprint l10n_Spanish]].
* We use [Poedit](https://poedit.net/) for the translations (comes with Tails). * We use [Poedit](https://poedit.net/) for the translations.
* The first documents to translate should be the * The first documents to translate should be the
[[core pages|contribute/l10n_tricks/core_po_files.txt]]. [[core pages|contribute/l10n_tricks/core_po_files.txt]].
......
...@@ -805,7 +805,7 @@ you can follow the next steps: ...@@ -805,7 +805,7 @@ you can follow the next steps:
ISO history ISO history
----------- -----------
Push the released ISO and USB images and their artifacts (`.buildlog`, In this section, you will push the released ISO and USB images and their artifacts (`.buildlog`,
`.build-manifest`, and `.packages` files) to our Tails ISO history git-annex `.build-manifest`, and `.packages` files) to our Tails ISO history git-annex
repo, so that: repo, so that:
......
...@@ -7,7 +7,7 @@ msgid "" ...@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Tails translations\n" "Project-Id-Version: Tails translations\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n" "Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2020-11-16 11:13+0100\n" "POT-Creation-Date: 2021-04-01 01:51+0000\n"
"PO-Revision-Date: 2019-11-22 16:30+0000\n" "PO-Revision-Date: 2019-11-22 16:30+0000\n"
"Last-Translator: Muri Nicanor <muri@immerda.ch>\n" "Last-Translator: Muri Nicanor <muri@immerda.ch>\n"
"Language-Team: Tails translations <tails-l10n@boum.org>\n" "Language-Team: Tails translations <tails-l10n@boum.org>\n"
...@@ -170,10 +170,6 @@ msgstr "" ...@@ -170,10 +170,6 @@ msgstr ""
"[Audacity](https://www.audacityteam.org/), zum Aufnehmen und Bearbeiten von " "[Audacity](https://www.audacityteam.org/), zum Aufnehmen und Bearbeiten von "
"Sound ([[Mehr...|doc/sensitive_documents/sound_and_video]])" "Sound ([[Mehr...|doc/sensitive_documents/sound_and_video]])"
#. type: Bullet: '* '
msgid "[Poedit](https://poedit.net/) to edit .po files"
msgstr "[Poedit](https://poedit.net/) zum Editieren von .po-Dateien"
#. type: Bullet: '* ' #. type: Bullet: '* '
msgid "" msgid ""
"[Simple Scan](https://launchpad.net/simple-scan) and [SANE](http://sane-" "[Simple Scan](https://launchpad.net/simple-scan) and [SANE](http://sane-"
...@@ -425,6 +421,9 @@ msgstr "" ...@@ -425,6 +421,9 @@ msgstr ""
"zugänglich machen wollen, beachten Sie den [[Übersetzungsleitfaden|" "zugänglich machen wollen, beachten Sie den [[Übersetzungsleitfaden|"
"contribute/how/translate]]." "contribute/how/translate]]."
#~ msgid "[Poedit](https://poedit.net/) to edit .po files"
#~ msgstr "[Poedit](https://poedit.net/) zum Editieren von .po-Dateien"
#~ msgid "[Scribus](https://www.scribus.net/) for page layout" #~ msgid "[Scribus](https://www.scribus.net/) for page layout"
#~ msgstr "[Scribus](https://www.scribus.net/), ein Layout-Programm" #~ msgstr "[Scribus](https://www.scribus.net/), ein Layout-Programm"
......
...@@ -6,8 +6,8 @@ msgid "" ...@@ -6,8 +6,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Tails\n" "Project-Id-Version: Tails\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n" "Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2020-11-16 11:13+0100\n" "POT-Creation-Date: 2021-04-01 01:51+0000\n"
"PO-Revision-Date: 2020-12-26 13:43+0000\n" "PO-Revision-Date: 2020-08-18 18:29+0000\n"
"Last-Translator: emmapeel <emma.peel@riseup.net>\n" "Last-Translator: emmapeel <emma.peel@riseup.net>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/" "Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
"features/es/>\n" "features/es/>\n"
...@@ -148,10 +148,6 @@ msgstr "" ...@@ -148,10 +148,6 @@ msgstr ""
"[Audacity](https://www.audacityteam.org/) para grabar y editar sonido " "[Audacity](https://www.audacityteam.org/) para grabar y editar sonido "
"([[Más...|doc/sensitive_documents/sound_and_video]])" "([[Más...|doc/sensitive_documents/sound_and_video]])"
#. type: Bullet: '* '
msgid "[Poedit](https://poedit.net/) to edit .po files"
msgstr "[Poedit](https://poedit.net/) para editar archivos .po"
#. type: Bullet: '* ' #. type: Bullet: '* '
msgid "" msgid ""
"[Simple Scan](https://launchpad.net/simple-scan) and [SANE](http://sane-" "[Simple Scan](https://launchpad.net/simple-scan) and [SANE](http://sane-"
...@@ -390,6 +386,9 @@ msgstr "" ...@@ -390,6 +386,9 @@ msgstr ""
"Si quieres que usar Tails sea más fácil para las personas que hablan tu " "Si quieres que usar Tails sea más fácil para las personas que hablan tu "
"idioma, mira las [[guías para traductores|contribute/how/translate]]." "idioma, mira las [[guías para traductores|contribute/how/translate]]."
#~ msgid "[Poedit](https://poedit.net/) to edit .po files"
#~ msgstr "[Poedit](https://poedit.net/) para editar archivos .po"
#~ msgid "" #~ msgid ""
#~ "Using the <span class=\"guilabel\">Additional Software</span>\n" #~ "Using the <span class=\"guilabel\">Additional Software</span>\n"
#~ "persistence feature, additional software can even be installed\n" #~ "persistence feature, additional software can even be installed\n"
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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