Commit d4097c97 authored by Ulrike Uhlig's avatar Ulrike Uhlig
Browse files

Merge branch 'master' of webmasters.boum.org:wiki

parents 6d47ce02 63809594
......@@ -326,7 +326,7 @@ msgid ""
"cryptographic tool that provides encryption, authentication and deniability."
msgstr ""
"Protege suas conversações em comunicadores instantâneos usando <span class="
"\"definition\">[[!wikipedia Off-the-Record_Messaging desc=\"OTR\"]]</span> "
"\"definition\">[[!wikipedia_pt Off-the-Record_Messaging desc=\"OTR\"]]</span> "
"(Off-the-Record Messaging, apenas em inglês), uma ferramenta criptográfica "
"para cifrar, autenticar e permitir negação plausível."
......
......@@ -35,6 +35,13 @@ XXX: If you feel like it and technical writers don't do it
git log --patch --since='1 October' --until='1 November' origin/master -- "*.*m*"
- We merged the former /install/os into [[/install|install]] to
streamline a bit more our installation instructions.
- We changed the style of the purple headers that we had on our homepage
to look less like buttons. We're now consistently using green for
clickable elements and purple for non-clickable elements.
User experience
===============
......
......@@ -152,3 +152,22 @@ can be fed back to Weblate by cherry picking.
On the long term, we will automate this process by
- pulling automatically from tails/master and applying a merge strategy
for po [[!tails_ticket ]]
Weblate installation and maintenance - a hybrid approach
--------------------------------------------------------
The Tails infrastructure uses Puppet to make it easier to enforce and replicate system configuration, and usually relies on Debian packages to ensure stability of the system. But the effort to maintain a stable system somehow conflicts with installing and maintaining Weblate, a Python web application, which requires using up-to-date versions of Weblate itself and of its dependencies.
Having that in mind, and taking into account that we already started using Docker to replicate the translation server environment to experiment with upgrading and running an up-to-date version of Weblate, it can be a good trade-off to use Puppet to provide an environment to run Docker, and to use a Docker container to actually run an up-to-date Weblate installation.
From the present state of the Docker image, which currently uses (slightly modified/updated) Puppet code to configure the environment and then sets up Weblate, the following steps could be taken to achieve a new service configuration as described above:
* Move the database to a separate Docker service.
* Remove all Puppet code from the Docker image: inherit from the simplest possible Docker image and setup a Weblate Docker image with all needed dependencies.
* Modify the Puppet code to account for setting up an environment that has Docker installed and that runs the Weblate Docker image.
* Set up persistence for the Weblate git repository and configuration.
* Set up persistence and backups for the database service.
* Update the Puppet code to run tmserver (if/when it's needed -- latest Weblate accounts for basic suggestions using its own database).
After that, we should have a clear separation between stable infrastructure maintenance using Debian+Puppet in one side and up-to-date Weblate application deployment using Docker in the other side. The Docker image would have to be constantly maintained to account for Weblate upgrades, but that should be easier cleaner than deploying Weblate directly in the server.
......@@ -46,7 +46,7 @@ All times are referenced to Berlin and Paris time.
* 2018-08-13: Release 3.9~rc1 — anonym
* 2018-08-21: **Release 3.9** (Firefox 60.2, major release) — anonym is the RM
* 2018-09-05: **Release 3.9** (Firefox 60.2, major release) — anonym is the RM
- includes VeraCrypt support + major Additional Software Packages improvements
## 2018Q4
......
......@@ -55,7 +55,7 @@ Priorities for the next years
### Sustainability of core code
- **Try basing Tails on rolling snapshots of Debian Testing** to bring upstream changes earlier to Tails and collaborate better with upstream ([[!tails_ticket 12615]], [[Blueprint|blueprint/Debian_testing]])
- **Have a budget for user-visible improvements** to our core applications
- **Have a budget for user-visible improvements** to our core applications ([[!tails_ticket 14544]])
- **Port complex shell scripts to Python** ([[!tails_ticket 11189]], [[Blueprint|blueprint/Port_shell_scripts_to_Python]])
- **Migrate from `aufs` to `overlayfs`** ([[!tails_ticket 8415]])
- **Have more robust time synchronization** when starting Tails ([[!tails_ticket 5774]], [[Blueprint|blueprint/robust_time_syncing]])
......
......@@ -110,6 +110,8 @@ msgid ""
"[Trusted End Node Security](http://www.spi.dod.mil/lipose.htm) (previously "
"*Lightweight Portable Security*)"
msgstr ""
"[Trusted End Node Security](http://www.spi.dod.mil/lipose.htm) ("
"anteriormente *Lightweight Portable Security*)"
#. type: Bullet: '* '
msgid "[Whonix](https://www.whonix.org/)"
......
......@@ -50,9 +50,9 @@ msgid ""
msgstr ""
"Tails requiere un procesador 64-bit compatible con <span class=\""
"definition\">[[!wikipedia_es x86-64]]</span>: **<span class=\"definition\">[["
"!wikipedia_es IBM_PC_compatible]]</span>** y otros, pero no <span class=\""
"!wikipedia_es Compatible_IBM_PC]]</span>** y otros, pero no <span class=\""
"definition\">[[!wikipedia_es PowerPC]]</span> o <span class=\"definition\">[["
"!wikipedia_es ARM]]</span>. Las computadoras Mac son compatibles con "
"!wikipedia_es Arquitectura_ARM]]</span>. Las computadoras Mac son compatibles con "
"computadoras IBM desde 2006. Tails **no funciona** practicamente en ninguna "
"tablet o teléfono."
......
......@@ -48,9 +48,9 @@ msgid ""
msgstr ""
"Tails requer um processador de 64 bits compatível com <span class="
"\"definition\">[[!wikipedia x86-64]]</span>: **<span class=\"definition\">[[!"
"wikipedia IBM_PC_compatible desc=\"compatíveis com IBM PC\"]]</span>** e "
"outros, mas não <span class=\"definition\">[[!wikipedia PowerPC]]</span> e "
"nem <span class=\"definition\">[[!wikipedia ARM_architecture desc=\"ARM\"]]</"
"wikipedia_pt IBM_PC_compatível desc=\"compatíveis com IBM PC\"]]</span>** e "
"outros, mas não <span class=\"definition\">[[!wikipedia_pt PowerPC]]</span> e "
"nem <span class=\"definition\">[[!wikipedia_pt Arquitetura_ARM desc=\"ARM\"]]</"
"span>. Computadores Mac são compatíveis com IBM PC desde 2006. Tails **não** "
"funciona na maioria dos tablets e telefones."
......
......@@ -23,8 +23,8 @@ msgid ""
"[[!traillink Installing_additional_software|advanced_topics/"
"additional_software]]"
msgstr ""
"[[!traillink Instalando_software_adicional|advanced_topics/"
"additional_software]]"
"[[!traillink "
"Instalar_software_adicional|advanced_topics/additional_software]]"
#. type: Bullet: ' - '
msgid ""
......
......@@ -33,7 +33,7 @@ msgid ""
"Virtual_machine desc=\"virtual machines\"]]."
msgstr ""
"Es ist manchmal angenehm, Tails ausführen zu können, ohne den Computer jedes "
"Mal neu zu starten. Dies ist mit der Nutzung einer [[!wikipedia "
"Mal neu zu starten. Dies ist mit der Nutzung einer [[!wikipedia_de "
"Virtuelle_Maschine desc=\"virtuellen Maschine\"]] möglich."
#. type: Plain text
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2017-07-31 21:51+0000\n"
"PO-Revision-Date: 2018-03-21 16:22+0100\n"
"PO-Revision-Date: 2018-04-21 14:41+0200\n"
"Last-Translator: Tails translators\n"
"Language-Team: \n"
"Language: de\n"
......@@ -63,7 +63,7 @@ msgstr ""
" - [[!traillink Den_beständigen_Speicherbereich_löschen|first_steps/persistence/delete]]\n"
" - [[!traillink Einen_Fehler_melden|first_steps/bug_reporting]]\n"
" - [[!traillink Tails_herunterfahren|first_steps/shutdown]]\n"
" - [[!traillink Eine_auf_USB-Stick_existierende_Tails-Installation_aktualisieren|first_steps/upgrade]]\n"
" - [[!traillink Einen_USB-Stick_mit_Tails_aktualisieren|first_steps/upgrade]]\n"
" - Tails deinstallieren oder USB-Stick zurücksetzen\n"
" unter [[!traillink Linux|first_steps/reset/linux]],\n"
" [[!traillink Windows|first_steps/reset/windows]],\n"
......
......@@ -195,6 +195,8 @@ msgstr " diskutil list\n"
#, no-wrap
msgid " It returns a list of the storage devices on the system. For example:\n"
msgstr ""
" Devuelve una lista de los dispositivos de almacenamiento del sistema. Por "
"ejemplo:\n"
#. type: Plain text
#, no-wrap
......@@ -208,10 +210,18 @@ msgid ""
" 3: EFI 134.1 GB disk0s3\n"
" 4: Microsoft Basic Data BOOTCAMP 115.5 GB disk0s4\n"
msgstr ""
" $ diskutil list\n"
" /dev/disk0\n"
" #: TYPE NAME SIZE IDENTIFIER\n"
" 0: GUID_partition_scheme *500.1 GB disk0\n"
" 1: EFI 209.7 MB disk0s1\n"
" 2: Apple_HFS MacDrive 250.0 GB disk0s2\n"
" 3: EFI 134.1 GB disk0s3\n"
" 4: Microsoft Basic Data BOOTCAMP 115.5 GB disk0s4\n"
#. type: Bullet: '1. '
msgid "Plug the USB stick in the computer."
msgstr ""
msgstr "Inserta la memoria USB en el ordenador."
#. type: Bullet: '1. '
msgid "Execute again the same command:"
......
......@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2017-12-27 00:17+0100\n"
"PO-Revision-Date: 2015-11-06 15:20+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"PO-Revision-Date: 2018-04-22 10:15+0200\n"
"Last-Translator: Tails translators\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.10\n"
"X-Generator: Poedit 2.0.6\n"
"Language-Team: \n"
#. type: Plain text
#, no-wrap
......@@ -30,18 +30,24 @@ msgid ""
"By clicking on the system menu located in the upper right corner of the "
"screen and choosing either:"
msgstr ""
"Indem Sie das Systemmenü, welches in der oberen rechten Ecke des Bildschirm "
"ist, anklicken und Sie entweder"
#. type: Bullet: ' - '
msgid ""
"[[!img lib/system-shutdown.png link=\"no\" class=\"symbolic-22\" alt="
"\"Shutdown icon\"]] to shutdown the computer or"
msgstr ""
"[[!img lib/system-shutdown.png link=\"no\" class=\"symbolic-22\" alt="
"\"Herunterfahren-Symbol\"]] auswählen, um den Computer herunterzufahren oder"
#. type: Bullet: ' - '
msgid ""
"[[!img lib/view-refresh.png link=\"no\" class=\"symbolic-22\" alt=\"Restart "
"icon\"]] to restart the computer."
msgstr ""
"[[!img lib/view-refresh.png link=\"no\" class=\"symbolic-22\" alt="
"\"Neustarten-Symbol\"]] auswählen, um den Computer neuzustarten."
#. type: Plain text
#, no-wrap
......@@ -49,13 +55,11 @@ msgid " [[!img introduction_to_gnome_and_the_tails_desktop/system.png link=\"no
msgstr " [[!img introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
#. type: Plain text
#, fuzzy
#| msgid "- By removing physically the device Tails is running from."
msgid ""
"- By physically removing the USB stick or DVD that Tails is running from."
msgstr ""
"- Indem man das physikalische Speichermedium entfernt, von dem Tails "
"gestartet wurde"
"- Indem Sie den USB-Stick oder die DVD, von der Tails läuft, physisch "
"entfernen."
#. type: Plain text
#, no-wrap
......@@ -79,7 +83,7 @@ msgid ""
"volume|persistence/check_file_system]].</p>\n"
msgstr ""
"<p>Sollten Sie den beständigen Datenträger nicht mehr aktivieren können, nachdem\n"
"Sie diese Methode benutzt haben. können Sie Ihre Daten sehr wahrscheinlich wiederherstellen,\n"
"Sie diese Methode benutzt haben, sollten Sie den Großteil Ihrer Daten wiederherstellen können,\n"
"indem Sie das [[Dateisystem des beständigen Datenträgers überprüfen|persistence/check_the_file_system]].\n"
#. type: Plain text
......@@ -111,39 +115,3 @@ msgstr ""
"Während des Herunterfahrens werden die Daten, die im <span class=\"definition\">[[!wikipedia_de \n"
"Random-Access_Memory desc=\"RAM\"]]</span> gespeichert sind, gelöscht, um\n"
"[[Kaltstartattacken|doc/advanced_topics/cold_boot_attacks]] zu verhindern. \n"
#~ msgid "- By pressing the power button of the computer."
#~ msgstr "- Indem man den Einschaltknopf des Computers betätigt"
#~ msgid ""
#~ "This method does not work [[after using the <span class=\"application"
#~ "\">Tails\n"
#~ "Installer</span>|support/known_issues#index10h2]], see\n"
#~ "[[!tails_ticket 5677]].\n"
#~ msgstr ""
#~ "Diese Methode funktioniert nicht, [[nachdem der <span class=\"application"
#~ "\">Tails-\n"
#~ "Installer</span>|support/known_issues#index10h2]] benutzt wurde, siehe\n"
#~ "[[!tails_ticket 5677]].\n"
#~ msgid ""
#~ "<p>Using the [[<span class=\"guilabel\">read-only</span> option|"
#~ "persistence/use]]\n"
#~ "of the persistent volume prevents this problem.</p>\n"
#~ msgstr ""
#~ "<p>Das Aktivieren der [[<span class=\"guilabel\">Nur-lesen</span> Option|"
#~ "persistence/use]]\n"
#~ "des beständigen Datenträgers vermeidet dieses Problem.</p>\n"
#~ msgid ""
#~ "By clicking on the [[system shutdown icon|"
#~ "introduction_to_gnome_and_the_tails_desktop#shutdown]] located in the "
#~ "upper right corner of the notification area and choosing <span class="
#~ "\"guimenuitem\">Shutdown Immediately</span> or <span class=\"guimenuitem"
#~ "\">Reboot Immediately</span>."
#~ msgstr ""
#~ "Indem man das [[Herunterfahren-Icon|"
#~ "introduction_to_gnome_and_the_tails_desktop#shutdown]], welches sich in "
#~ "der oberen rechten Ecke befindet, anklickt und <span class=\"guimenuitem"
#~ "\">Sofort Herunterfahren</span> oder <span class=\"guimenuitem\">Sofort "
#~ "Neustarten</span> auswählt."
......@@ -7,20 +7,19 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2017-11-09 18:59+0000\n"
"PO-Revision-Date: 2016-06-01 17:18+0200\n"
"Last-Translator: spriver <spriver@autistici.org>\n"
"PO-Revision-Date: 2018-04-22 09:33+0200\n"
"Last-Translator: Tails translators\n"
"Language-Team: Tails localization discussion <tails-l10n@boum.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7.1\n"
"X-Generator: Poedit 2.0.6\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "[[!meta title=\"Upgrading a Tails USB stick or SD card\"]]\n"
#, no-wrap
msgid "[[!meta title=\"Upgrading a Tails USB stick\"]]\n"
msgstr "[[!meta title=\"Eine existierende Tails-Installation auf USB-Stick oder SD-Karte aktualisieren\"]]\n"
msgstr "[[!meta title=\"Einen USB-Stick mit Tails aktualisieren\"]]\n"
#. type: Plain text
msgid ""
......@@ -44,8 +43,8 @@ msgid ""
"Our upgrades always fix important security issues so it is important to do "
"them as soon as possible."
msgstr ""
"Unsere Aktualisierungen beheben immer wichtige Sicherheitslücken, also ist "
"es wichtig, diese so schnell wie möglich durchzuführen."
"Unsere Aktualisierungen beheben immer wichtige Sicherheitslücken, es ist "
"also wichtig, diese so schnell wie möglich durchzuführen."
#. type: Plain text
#, no-wrap
......@@ -53,19 +52,15 @@ msgid "</div>\n"
msgstr "</div>\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid ""
#| "Both techniques only work if the upgraded device, USB stick or SD card, was\n"
#| "installed using <span class=\"application\">Tails Installer</span>. **The\n"
#| "persistent storage on the device will be preserved.**\n"
#, no-wrap
msgid ""
"Both techniques only work if the upgraded USB stick, was\n"
"installed using <span class=\"application\">Tails Installer</span>. **The\n"
"persistent storage on the USB stick will be preserved.**\n"
msgstr ""
"Beide Methoden funktionieren nur, wenn das zu aktualisierende Speichermedium, der USB-Stick\n"
"oder die SD-Karte, mithilfe des <span class=\"application\">Tails Installers</span> installiert\n"
"wurden. **Die beständige Speicherpartition auf dem Speichermedium bleibt erhalten.**\n"
"Beide Methoden funktionieren nur, wenn der zu aktualisierende USB-Stick\n"
"mithilfe des <span class=\"application\">Tails Installers</span> installiert\n"
"wurde. **Der beständige Speicherbereich auf dem USB-Stick bleibt erhalten.**\n"
#. type: Plain text
#, no-wrap
......@@ -99,15 +94,10 @@ msgstr "<a name=\"automatic\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Automatic upgrade using <span class=\"application\">Tails Upgrader</span>\n"
msgstr "Automatische Aktualisierung mit Hilfe des <span class=\"application\">Tails Upgraders</span>\n"
msgstr "Automatische Aktualisierung mithilfe des <span class=\"application\">Tails Upgraders</span>\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid ""
#| "After starting Tails and connecting to Tor, <span class=\"application\">Tails\n"
#| "Upgrader</span> automatically checks if upgrades are available and then\n"
#| "proposes you to upgrade your device. The upgrades are checked for and downloaded\n"
#| "through Tor.\n"
#, no-wrap
msgid ""
"After starting Tails and connecting to Tor, <span class=\"application\">Tails\n"
"Upgrader</span> automatically checks if upgrades are available and then\n"
......@@ -116,7 +106,7 @@ msgid ""
msgstr ""
"Nach dem Start von Tails und dem Herstellen einer Verbindung zu Tor prüft der <span class=\"application\">Tails\n"
"Upgrader</span> automatisch, ob Aktualisierungen verfügbar sind und schlägt Ihnen\n"
"dann vor, ihr Speichermedium zu aktualisieren. Die Suche nach Aktualisierungen und der Download\n"
"dann vor, Ihren USB-Stick zu aktualisieren. Die Suche nach Aktualisierungen und der Download\n"
"werden über Tor durchgeführt.\n"
#. type: Plain text
......@@ -124,16 +114,12 @@ msgid "The advantages of this technique are the following:"
msgstr "Dieses Vorgehen halt folgende Vorteile:"
#. type: Bullet: ' - '
#, fuzzy
#| msgid ""
#| "You only need a single Tails device. The upgrade is done on the fly from "
#| "a running Tails. After upgrading, you can restart and use the new version."
msgid ""
"You only need a single Tails USB stick. The upgrade is done on the fly from "
"a running Tails. After upgrading, you can restart and use the new version."
msgstr ""
"Sie benötigen nur ein einziges Tails Speichermedium. Die Aktualisierung wird "
"während des Betriebes eines laufenden Tails durchgeführt.\n"
"Sie benötigen nur einen einzigen USB-Stick mit Tails. Die Aktualisierung "
"wird während des Betriebes eines laufenden Tails durchgeführt.\n"
"Nach der Aktualisierung können Sie einen Neustart durchführen und die neue "
"Version verwenden."
......@@ -141,7 +127,7 @@ msgstr ""
msgid "The upgrade is much smaller to download than a full ISO image."
msgstr ""
"Die Aktualisierung ist viel kleiner als der Download eines kompletten ISO-"
"Abbildes."
"Images."
#. type: Bullet: ' - '
msgid ""
......@@ -149,7 +135,7 @@ msgid ""
"You don't have to verify the ISO image yourself anymore."
msgstr ""
"Der Aktualisierungsvorgang enthält eine kryptografische Verifizierung der "
"Aktualisierung. Es ist nicht mehr nötig, dass Sie das ISO-Abbild selbst "
"Aktualisierung. Es ist nicht mehr nötig, dass Sie das ISO-Image selbst "
"verifizieren müssen."
#. type: Plain text
......@@ -157,33 +143,25 @@ msgid "Requirements:"
msgstr "Voraussetzungen:"
#. type: Bullet: ' - '
#, fuzzy
#| msgid ""
#| "A Tails device, USB stick or SD card, installed using <span class="
#| "\"application\">Tails Installer</span>."
msgid ""
"A Tails USB stick, installed using <span class=\"application\">Tails "
"Installer</span>."
msgstr ""
"Ein Tails Speichermedium, USB-Stick oder SD-Karte, das mit Hilfe des <span "
"class=\"application\">Tails Installers</span> installiert wurde."
"Einen USB-Stick mit Tails, der mithilfe des <span class=\"application"
"\">Tails Installers</span> installiert wurde."
#. type: Bullet: ' - '
msgid "An Internet connection."
msgstr "Eine Internetverbindung."
#. type: Plain text
#, fuzzy
#| msgid ""
#| "After connecting to Tor, if an upgrade is available, a dialog box appears "
#| "and proposes you to upgrade your device."
msgid ""
"After connecting to Tor, if an upgrade is available, a dialog appears and "
"proposes you to upgrade your USB stick."
msgstr ""
"Nachdem eine Verbindung zu Tor aufgebaut wurde, wird, falls eine "
"Aktualisierung verfügbar ist, ein Dialogfenster erscheinen und Ihnen "
"vorschlagen, Ihr Speichermedium zu aktualisieren."
"vorschlagen, Ihren USB-Stick zu aktualisieren."
#. type: Plain text
#, no-wrap
......@@ -206,7 +184,7 @@ msgstr ""
"schließen.</li>\n"
"<li>Das Herunterladen der Aktualisierung kann eine lange Zeit in Anspruch nehmen,\n"
"von ein paar Minuten bis zu einigen Stunden.</li>\n"
"<li>Die Netzwerkfuntionen werden nach dem Download der Aktualisierung deaktiviert.</li>\n"
"<li>Die Netzwerkfunktionen werden nach dem Download der Aktualisierung deaktiviert.</li>\n"
"</ul>\n"
#. type: Plain text
......@@ -246,7 +224,7 @@ msgid ""
"Upgrader</span> later by opening a terminal and executing the following\n"
"command:</p>\n"
msgstr ""
"<p>Falls Sie beim Starten nicht aktualisieren können (zum Beispiel wenn Sie\n"
"<p>Falls Sie beim Starten nicht aktualisieren können (zum Beispiel, wenn Sie\n"
"zu dem Zeitpunkt keine Netzwerkverbindung haben), können Sie den <span class=\"application\">Tails\n"
"Upgrader</span> später durch das Ausführen des folgenden Befehls\n"
"starten:</p>\n"
......@@ -262,13 +240,7 @@ msgid "<p>We recommend you read the [[release notes|release_notes]] for the late
msgstr "<p>Wir empfehlen Ihnen, die [[Versionshinweise|release_notes]] für die neueste Version zu lesen. Sie beschreiben alle Änderungen in dieser neuen Version:</p>\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid ""
#| "<ul>\n"
#| " <li>new features</li>\n"
#| " <li>bugs that were solved</li>\n"
#| " <li>known issues that have already been identified</li>\n"
#| "</ul>\n"
#, no-wrap
msgid ""
"<ul>\n"
" <li>new features</li>\n"
......@@ -292,8 +264,8 @@ msgid ""
"If an error occurs, the assistant proposes you to read one of the following "
"pages:"
msgstr ""
"Falls ein Fehler auftritt, schlägt Ihnen der Assistent vor, folgende Seiten "
"zu lesen:"
"Sollte ein Fehler auftreten, schlägt Ihnen der Assistent vor, folgende "
"Seiten zu lesen:"
#. type: Bullet: ' - '
msgid ""
......@@ -330,7 +302,7 @@ msgstr "<a name=\"manual\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Manual upgrade using <span class=\"application\">Tails Installer</span>\n"
msgstr "Manuelles Aktualisieren mit Hilfe des <span class=\"application\">Tails Installers</span>\n"
msgstr "Manuelles Aktualisieren mithilfe des <span class=\"application\">Tails Installers</span>\n"
#. type: Plain text
msgid ""
......@@ -347,60 +319,47 @@ msgstr ""
"verfügbar ist."
#. type: Bullet: ' - '
#, fuzzy
#| msgid ""
#| "The automatic upgrade is impossible for technical reasons (not enough "
#| "memory, not enough free space on the device, etc.)."
msgid ""
"The automatic upgrade is impossible for technical reasons (not enough "
"memory, not enough free space on the USB stick, etc.)."
msgstr ""
"Die Aktualisierung aus technischen Gründen nicht möglich ist (kein "
"ausreichender Arbeitsspeicher, nicht genügend freier Speicherplatz auf dem "
"Speichermedium, usw.)"
"USB-Stick, usw.)."
#. type: Bullet: ' - '
#, fuzzy
#| msgid ""
#| "You want to upgrade from another Tails device which already has a newer "
#| "version installed, for example when working offline."
msgid ""
"You want to upgrade from another Tails USB stick which already has a newer "
"version installed, for example when working offline."
msgstr ""
"Wenn Sie eine Aktualisierung über ein anderes Tails Speichermedium, welches "
"Wenn Sie eine Aktualisierung über einen anderen USB-Stick mit Tails, welcher "
"bereits die neuere Version installiert hat, durchführen wollen, zum "
"Beispiel, wenn Sie Offline arbeiten."
#. type: Bullet: ' - '
#, fuzzy
#| msgid "The automatic upgrade failed and you need to repair a Tails device."
msgid "The automatic upgrade failed and you need to repair a Tails USB stick."
msgstr ""
"Die automatische Aktualisierung fehlgeschlagen ist und Sie das "
"Speichermedium mit Tails reparieren müssen."
"Die automatische Aktualisierung fehlgeschlagen ist und Sie den USB-Stick mit "
"Tails reparieren müssen."
#. type: Plain text
#, fuzzy, no-wrap
#| msgid ""
#| "In this case, <span class=\"application\">Tails Installer</span> allows you to\n"
#| "manually upgrade a USB stick or SD card to a newer version of Tails.\n"
#| "To do so, follow our [[manual upgrade instructions|/upgrade]].\n"
#, no-wrap
msgid ""
"After connecting to Tor, a dialog informs you if you have to\n"
"upgrade your USB stick using <span class=\"application\">Tails Installer</span>\n"
"to a newer version of Tails.\n"
"To do so, follow our [[manual upgrade instructions|/upgrade]].\n"
msgstr ""
"In diesem Falle erlaubt es Ihnen der <span class=\"application\">Tails Installer</span>\n"
"eine manuelle Aktualisierung eines USB-Sticks oder einer SD-Karte auf eine neuere Version\n"
"von Tails durchzuführen. Um das zu tun, befolgen Sie unsere [[Anweisungen zum manuellen Aktualisieren|/upgrade]].\n"
"Nachdem eine Verbindung zu Tor hergestellt wurde, wird Sie ein Fenster informieren,\n"
"falls es nötig ist, den USB-Stick mit dem <span class=\"application\">Tails Installer</span>\n"
"auf eine neuere Version von Tails zu aktualisieren.\n"
"Um das zu tun, befolgen Sie unsere [[Anweisungen zum manuellen Aktualisieren|/upgrade]].\n"
#. type: Plain text
#, fuzzy, no-wrap
#, no-wrap
#| msgid "[[!img upgrader_automatic.png link=no]]\n"
msgid "[[!img upgrader_manual.png link=no]]\n"
msgstr "[[!img upgrader_automatic.png link=no]]\n"
msgstr "[[!img upgrader_manual.png link=no]]\n"
#. type: Plain text
#, no-wrap
......
......@@ -5,9 +5,10 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2018-04-10 20:38+0300\n"
"PO-Revision-Date: 2016-11-03 19:28+0000\n"
"Last-Translator: Tails developers <amnesiatranslators@boum.org>\n"
"PO-Revision-Date: 2018-04-27 07:40+0000\n"
"Last-Translator: cacukin <cacukin@cryptolab.net>\n"
"Language-Team: Spanish <https://translate.tails.boum.org/projects/tails/src-"
"donate/es/>\n"
"Language: es\n"
......@@ -215,72 +216,41 @@ msgid ""
msgstr ""
#. type: Content of: <div><div><div><div><p>
#, fuzzy
#| msgid ""
#| "Your donation goes entirely to Tails and will be handled by the Center "
#| "for the Cultivation of Technology (CCT) which is a non-profit "
#| "organization in Germany."
msgid ""
"Your donation goes entirely to Tails and will be handled by RiseupLabs which "
"is a 501(c)(3) non-profit organization in the USA."
msgstr ""
"Tu donación llegará en su totalidad para Tails y será gestionada por el "
"Center for the Cultivation of Technology (CCT) que es una organización sin "
"fines de lucro de Alemania."
"Tu donación llegará a Tails en su totalidad y será gestionada por "
"RiseupLabs que es una organización sin fines de lucro 501(c)(3) en Estados "
"Unidos."
#. type: Content of: <div><div><div><div><p>
#, fuzzy
#| msgid ""
#| "<a href=\"https://techcultivation.org/donate.html\">Donations are tax-"
#| "deductible to the full extent permitted by law.</a>"
msgid ""
"<strong>Donations are tax-deductible to the full extent permitted by law.</"
"strong>"
msgstr ""
"<a href=\"https://techcultivation.org/donate.html\">Las donaciones son "
"deducibles de impuestos dentro de los límites impuestos por la ley</a>"
"<strong>Las donaciones son deducibles de impuestos dentro de los límites "
"impuestos por la ley</strong>"
#. type: Content of: <div><div><div><p>
#, fuzzy
#| msgid ""
#| "Your donation goes entirely to Tails and will be handled by the Center "
#| "for the Cultivation of Technology (CCT) which is a non-profit "
#| "organization in Germany."
msgid ""
"Your donation goes entirely to Tails and will be handled by Zwiebelfreunde "
"which is a non-profit organization in Germany."
msgstr ""
"Tu donación llegará en su totalidad para Tails y será gestionada por el "
"Center for the Cultivation of Technology (CCT) que es una organización sin "
"fines de lucro de Alemania."
"Tu donación llegará a Tails en su totalidad y será gestionada por "
"Zwiebelfreunde que es una organización sin fines de lucro de Alemania."
#. type: Content of: <div><div><div><div><h2>
msgid "Donate in dollars"
msgstr ""
msgstr "Dona en dólares"
#. type: Content of: <div><div><div><div><h3>
msgid "Recurring donation"
msgstr ""
msgstr "Donación recurrente"
#. Note for translators: adapt the URLs to return to the page in your language.
#. Note for translators: adapt the value of 'lc' to your language.
#. type: Content of: <div><div><div><div><form>
#, fuzzy