Skip to content

GitLab

Commit 6b9e13f1 authored by intrigeri's avatar intrigeri
Browse files
Options

Merge branch 'feature/17005-po4a-0.55'

parents be483b7c d07c1ccc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 7276 additions and 6127 deletions
config/chroot_apt/preferences
View file @ 6b9e13f1
......@@ -50,11 +50,6 @@ Package: obfs4proxy
Pin: release o=TorProject,n=obfs4proxy
Pin-Priority: 990
Explanation: install 0.47 for now (#17005)
Package: po4a
Pin: origin deb.tails.boum.org
Pin-Priority: 999
Package: python3-dogtail
Pin: release o=Debian,n=bullseye
Pin-Priority: 999
......
vagrant/definitions/tails-builder/postinstall.sh
View file @ 6b9e13f1
......@@ -49,7 +49,7 @@ cat "/etc/apt/sources.list" | \
echo "deb http://time-based.snapshots.deb.tails.boum.org/debian-security/${DEBIAN_SECURITY_SERIAL}/ buster/updates main" \
> "/etc/apt/sources.list.d/buster-security.list"
echo "I: Adding our builder-jessie suite with live-build and po4a..."
echo "I: Adding our builder-jessie suite with live-build..."
echo "deb http://time-based.snapshots.deb.tails.boum.org/tails/${TAILS_SERIAL}/ builder-jessie main" > "/etc/apt/sources.list.d/tails.list"
sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/tails <<EOF
Package: *
......@@ -61,12 +61,6 @@ sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/live-build <<EOF
Pin: release o=Tails,n=builder-jessie
Pin-Priority: 999
EOF
# Install po4a 0.47 for now (#17005)
sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/po4a <<EOF
Package: po4a
Pin: release o=Tails,n=builder-jessie
Pin-Priority: 999
EOF
sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/buster-backports << EOF
Package: *
......
wiki/src/about.de.po
View file @ 6b9e13f1
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails i10n Team\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2017-07-31 21:51+0000\n"
"POT-Creation-Date: 2020-04-12 16:10+0200\n"
"PO-Revision-Date: 2019-11-22 16:25+0000\n"
"Last-Translator: testuser2 <testuser2@translate.tails.boum.org>\n"
"Language-Team: Tails translators <tails-l10n@boum.org>\n"
......@@ -88,18 +88,14 @@ msgid "<a id=\"tor\"></a>\n"
msgstr "<a id=\"tor\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Online anonymity and censorship circumvention\n"
#, fuzzy, no-wrap
#| msgid "Online anonymity and censorship circumvention\n"
msgid "Online anonymity and censorship circumvention"
msgstr "Onlineanonymität und Zensurumgehung\n"
#. type: Plain text
#, no-wrap
msgid ""
"Tor\n"
"---\n"
msgid "Tor"
msgstr ""
"Tor\n"
"---\n"
#. type: Plain text
msgid ""
......@@ -222,8 +218,9 @@ msgid "<a id=\"amnesia\"></a>\n"
msgstr "<a id=\"amnesia\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Use anywhere but leave no trace\n"
#, fuzzy, no-wrap
#| msgid "Use anywhere but leave no trace\n"
msgid "Use anywhere but leave no trace"
msgstr "Überall nutzen, ohne Spuren zu hinterlassen\n"
#. type: Plain text
......@@ -275,8 +272,9 @@ msgid "<a id=\"cryptography\"></a>\n"
msgstr "<a id=\"cryptography\"></a>\n"
#. type: Title =
#, no-wrap
msgid "State-of-the-art cryptographic tools\n"
#, fuzzy, no-wrap
#| msgid "State-of-the-art cryptographic tools\n"
msgid "State-of-the-art cryptographic tools"
msgstr "Kryptographische Werkzeuge auf dem aktuellen Stand der Technik\n"
#. type: Plain text
......@@ -356,8 +354,9 @@ msgstr ""
"encryption_and_privacy]]"
#. type: Title =
#, no-wrap
msgid "What's next?\n"
#, fuzzy, no-wrap
#| msgid "What's next?\n"
msgid "What's next?"
msgstr "Was kommt als Nächstes?\n"
#. type: Plain text
......@@ -414,8 +413,9 @@ msgstr ""
"Veröffentlichungstermine, Treffen und andere Ereignisse."
#. type: Title =
#, no-wrap
msgid "Press and media\n"
#, fuzzy, no-wrap
#| msgid "Press and media\n"
msgid "Press and media"
msgstr "Presse und Medien\n"
#. type: Plain text
......@@ -423,8 +423,9 @@ msgid "See [[Press and media information|press]]."
msgstr "Lesen Sie die [[Medien- und Presseinformationen|press]]."
#. type: Title =
#, no-wrap
msgid "Social Contract\n"
#, fuzzy, no-wrap
#| msgid "Social Contract\n"
msgid "Social Contract"
msgstr "Sozialvertrag\n"
#. type: Plain text
......@@ -435,8 +436,9 @@ msgstr ""
"social_contract]]."
#. type: Title =
#, no-wrap
msgid "Acknowledgments and similar projects\n"
#, fuzzy, no-wrap
#| msgid "Acknowledgments and similar projects\n"
msgid "Acknowledgments and similar projects"
msgstr "Danksagungen und ähnliche Projekte\n"
#. type: Plain text
......@@ -448,10 +450,18 @@ msgstr ""
"acknowledgments_and_similar_projects]]."
#. type: Title =
#, no-wrap
msgid "Contact\n"
#, fuzzy, no-wrap
#| msgid "Contact\n"
msgid "Contact"
msgstr "Kontakt\n"
#. type: Plain text
msgid "See the [[contact page|about/contact]]."
msgstr "Lesen Sie die [[Kontaktseite|about/contact]]."
#~ msgid ""
#~ "Tor\n"
#~ "---\n"
#~ msgstr ""
#~ "Tor\n"
#~ "---\n"
wiki/src/about.es.po
View file @ 6b9e13f1
......@@ -6,11 +6,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2018-01-17 16:52+0000\n"
"POT-Creation-Date: 2020-04-12 16:10+0200\n"
"PO-Revision-Date: 2018-01-31 16:12+0000\n"
"Last-Translator: emmapeel <emma.peel@riseup.net>\n"
"Language-Team: Spanish "
"<http://translate.tails.boum.org/projects/tails/about/es/>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/about/"
"es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
......@@ -62,8 +62,8 @@ msgid ""
msgstr ""
"Es un sistema operativo completo diseñado para ser usado desde una memoria "
"USB o un DVD independientemente del sistema operativo original del "
"computador. Es [[software libre|doc/about/license]] y está basado en [["
"Debian GNU/Linux|https://www.debian.org/]]."
"computador. Es [[software libre|doc/about/license]] y está basado en "
"[[Debian GNU/Linux|https://www.debian.org/]]."
#. type: Plain text
msgid ""
......@@ -86,18 +86,14 @@ msgid "<a id=\"tor\"></a>\n"
msgstr "<a id=\"tor\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Online anonymity and censorship circumvention\n"
#, fuzzy, no-wrap
#| msgid "Online anonymity and censorship circumvention\n"
msgid "Online anonymity and censorship circumvention"
msgstr "Anonimato online y elusión de censura\n"
#. type: Plain text
#, no-wrap
msgid ""
"Tor\n"
"---\n"
msgid "Tor"
msgstr ""
"Tor\n"
"---\n"
#. type: Plain text
msgid ""
......@@ -217,8 +213,9 @@ msgid "<a id=\"amnesia\"></a>\n"
msgstr "<a id=\"amnesia\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Use anywhere but leave no trace\n"
#, fuzzy, no-wrap
#| msgid "Use anywhere but leave no trace\n"
msgid "Use anywhere but leave no trace"
msgstr "Úsalo donde sea sin dejar rastro\n"
#. type: Plain text
......@@ -266,8 +263,9 @@ msgid "<a id=\"cryptography\"></a>\n"
msgstr "<a id=\"cryptography\"></a>\n"
#. type: Title =
#, no-wrap
msgid "State-of-the-art cryptographic tools\n"
#, fuzzy, no-wrap
#| msgid "State-of-the-art cryptographic tools\n"
msgid "State-of-the-art cryptographic tools"
msgstr "Herramientas criptográficas de alto nivel\n"
#. type: Plain text
......@@ -285,10 +283,9 @@ msgid ""
"Linux_Unified_Key_Setup desc=\"LUKS\"]]</span>, the Linux standard for disk-"
"encryption."
msgstr ""
"[[Cifra tu memoria USB o disco duro "
"externo|doc/encryption_and_privacy/encrypted_volumes]] usando <span class=\""
"definition\">[[!wikipedia_es LUKS]]</span>, el estándar de Linux para cifrar "
"discos."
"[[Cifra tu memoria USB o disco duro externo|doc/encryption_and_privacy/"
"encrypted_volumes]] usando <span class=\"definition\">[[!wikipedia_es "
"LUKS]]</span>, el estándar de Linux para cifrar discos."
#. type: Bullet: ' - '
msgid ""
......@@ -309,10 +306,10 @@ msgid ""
"\"OpenPGP\"]]</span> either from Tails email client, text editor or file "
"browser."
msgstr ""
"Encripta y firma tus correos electrónicos y documentos usando el estándar *"
"de facto* <span class=\"definition\">[[!wikipedia_es Pretty_Good_Privacy#"
"OpenPGP desc=\"OpenPGP\"]]</span> ya sea del cliente de correo de Tails, "
"editor de textos o buscador de archivos."
"Encripta y firma tus correos electrónicos y documentos usando el estándar "
"*de facto* <span class=\"definition\">[[!wikipedia_es "
"Pretty_Good_Privacy#OpenPGP desc=\"OpenPGP\"]]</span> ya sea del cliente de "
"correo de Tails, editor de textos o buscador de archivos."
#. type: Bullet: ' - '
msgid ""
......@@ -320,10 +317,10 @@ msgid ""
"\">[[!wikipedia Off-the-Record_Messaging desc=\"OTR\"]]</span>, a "
"cryptographic tool that provides encryption, authentication and deniability."
msgstr ""
"Protege tus conversaciones de mensajería instantánea usando <span class=\""
"definition\">[[!wikipedia_es Off-the-Record_Messaging desc=\"OTR\"]]</span>, "
"una herramienta criptográfica para cifrar, autentificar, y que permite la "
"negación plausible."
"Protege tus conversaciones de mensajería instantánea usando <span class="
"\"definition\">[[!wikipedia_es Off-the-Record_Messaging desc=\"OTR\"]]</"
"span>, una herramienta criptográfica para cifrar, autentificar, y que "
"permite la negación plausible."
#. type: Bullet: ' - '
msgid ""
......@@ -344,8 +341,9 @@ msgstr ""
"encryption_and_privacy]]"
#. type: Title =
#, no-wrap
msgid "What's next?\n"
#, fuzzy, no-wrap
#| msgid "What's next?\n"
msgid "What's next?"
msgstr "¿Qué sigue?\n"
#. type: Plain text
......@@ -402,8 +400,9 @@ msgstr ""
"lanzamiento, encuentros y otros eventos."
#. type: Title =
#, no-wrap
msgid "Press and media\n"
#, fuzzy, no-wrap
#| msgid "Press and media\n"
msgid "Press and media"
msgstr "Prensa y medios\n"
#. type: Plain text
......@@ -411,8 +410,9 @@ msgid "See [[Press and media information|press]]."
msgstr "Mira la [[información de prensa y medios|press]]."
#. type: Title =
#, no-wrap
msgid "Social Contract\n"
#, fuzzy, no-wrap
#| msgid "Social Contract\n"
msgid "Social Contract"
msgstr "Contrato Social\n"
#. type: Plain text
......@@ -422,8 +422,9 @@ msgstr ""
"Lee nuestro [[Contrato Social|contribute/working_together/social_contract]]."
#. type: Title =
#, no-wrap
msgid "Acknowledgments and similar projects\n"
#, fuzzy, no-wrap
#| msgid "Acknowledgments and similar projects\n"
msgid "Acknowledgments and similar projects"
msgstr "Agradecimientos y proyectos similares\n"
#. type: Plain text
......@@ -435,14 +436,22 @@ msgstr ""
"acknowledgments_and_similar_projects]]."
#. type: Title =
#, no-wrap
msgid "Contact\n"
#, fuzzy, no-wrap
#| msgid "Contact\n"
msgid "Contact"
msgstr "Contacta\n"
#. type: Plain text
msgid "See the [[contact page|about/contact]]."
msgstr "Mira la [[página de contacto|about/contact]]."
#~ msgid ""
#~ "Tor\n"
#~ "---\n"
#~ msgstr ""
#~ "Tor\n"
#~ "---\n"
#~ msgid ""
#~ "I2P\n"
#~ "---\n"
......
wiki/src/about.fa.po
View file @ 6b9e13f1
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2017-07-31 21:51+0000\n"
"POT-Creation-Date: 2020-04-12 16:10+0200\n"
"PO-Revision-Date: 2015-10-21 10:58+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/about/fa/"
......@@ -93,18 +93,14 @@ msgid "<a id=\"tor\"></a>\n"
msgstr "<a id=\"tor\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Online anonymity and censorship circumvention\n"
#, fuzzy, no-wrap
#| msgid "Online anonymity and censorship circumvention\n"
msgid "Online anonymity and censorship circumvention"
msgstr "ناشناس ماندن آنلاین و دور زدن سانسور\n"
#. type: Plain text
#, no-wrap
msgid ""
"Tor\n"
"---\n"
msgid "Tor"
msgstr ""
"تور\n"
"---\n"
#. type: Plain text
msgid ""
......@@ -177,9 +173,8 @@ msgid ""
"resist attacks that block the usage of Tor using circumvention tools such as "
"[[bridges|doc/first_steps/welcome_screen/bridge_mode]]."
msgstr ""
"مقاومت در مقابل حملاتی که با استفاده از ابزارهای فیلتر شکن مانند "
"[[bridges|doc/first_steps/welcome_screen/bridge_mode]]. مانع از استفاده تور "
"می‌شوند."
"مقاومت در مقابل حملاتی که با استفاده از ابزارهای فیلتر شکن مانند [[bridges|"
"doc/first_steps/welcome_screen/bridge_mode]]. مانع از استفاده تور می‌شوند."
#. type: Plain text
#, fuzzy
......@@ -241,8 +236,9 @@ msgid "<a id=\"amnesia\"></a>\n"
msgstr "<a id=\"فراموشی\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Use anywhere but leave no trace\n"
#, fuzzy, no-wrap
#| msgid "Use anywhere but leave no trace\n"
msgid "Use anywhere but leave no trace"
msgstr "همه‌جا استفاده کنید، اما اثری به جا نگذارید.\n"
#. type: Plain text
......@@ -308,8 +304,9 @@ msgid "<a id=\"cryptography\"></a>\n"
msgstr "<a id=\"رمزنگاری\"></a>\n"
#. type: Title =
#, no-wrap
msgid "State-of-the-art cryptographic tools\n"
#, fuzzy, no-wrap
#| msgid "State-of-the-art cryptographic tools\n"
msgid "State-of-the-art cryptographic tools"
msgstr "بهترین ابزارهای رمزنگاری\n"
#. type: Plain text
......@@ -390,8 +387,9 @@ msgstr ""
"[[دربارهٔ این ابزارها، در مستندات بیشتر بخوانید.|doc/encryption_and_privacy]]"
#. type: Title =
#, no-wrap
msgid "What's next?\n"
#, fuzzy, no-wrap
#| msgid "What's next?\n"
msgid "What's next?"
msgstr "دیگر چه؟\n"
#. type: Plain text
......@@ -456,8 +454,9 @@ msgstr ""
"[[تقویم|contribute/calendar]] شامل تاریخ‌های انتشار، جلسات و برنامه‌های دیگر."
#. type: Title =
#, no-wrap
msgid "Press and media\n"
#, fuzzy, no-wrap
#| msgid "Press and media\n"
msgid "Press and media"
msgstr "رسانه‌ها و خبرگزاری‌ها\n"
#. type: Plain text
......@@ -466,7 +465,7 @@ msgstr "[[اطلاعات رسانه‌ها و خبرگزاری‌ها|press]] ر
#. type: Title =
#, no-wrap
msgid "Social Contract\n"
msgid "Social Contract"
msgstr ""