Commit b5cb4068 authored by sajolida's avatar sajolida
Browse files

Merge remote-tracking branch 'origin/master' into web/8568-extension-in-assistant

Conflicts:
	wiki/src/download.inline.mdwn
	wiki/src/install/inc/stylesheets/steps.css
parents 26aa460d 0dc408bf
......@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-11-03 01:06+0100\n"
"PO-Revision-Date: 2015-06-12 12:04-0000\n"
"PO-Revision-Date: 2015-11-18 16:36+0100\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
......@@ -283,7 +283,7 @@ msgid ""
"Build information:\n"
"%s"
msgstr ""
"Information de compilation:\n"
"Informations de compilation :\n"
"%s"
#: config/chroot_local-includes/usr/local/bin/tails-about:27
......
......@@ -4,6 +4,8 @@
<http://tp.linux.it/glossario.html>
<http://amagama-live.translatehouse.org>
Warning page = pagina degli avvertimenti/avvisi
Persistence = persistente https://it.wikipedia.org/wiki/Persistenza_%28informatica%29
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-11-03 18:42+0100\n"
"POT-Creation-Date: 2015-11-18 09:10+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"
......@@ -35,3 +35,7 @@ msgstr ""
#. type: Bullet: ' - '
msgid "[[Instructions for Windows|reset/windows]]"
msgstr ""
#. type: Bullet: ' - '
msgid "[[Instructions for Mac OS X|reset/mac]]"
msgstr ""
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-11-03 18:42+0100\n"
"POT-Creation-Date: 2015-11-18 09:10+0100\n"
"PO-Revision-Date: 2012-09-23 11:15-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -36,3 +36,9 @@ msgstr ""
#. type: Bullet: ' - '
msgid "[[Instructions for Windows|reset/windows]]"
msgstr "[[Instructions pour Windows|reset/windows]]"
#. type: Bullet: ' - '
#, fuzzy
#| msgid "[[Instructions for Windows|reset/windows]]"
msgid "[[Instructions for Mac OS X|reset/mac]]"
msgstr "[[Instructions pour Windows|reset/windows]]"
......@@ -4,3 +4,4 @@
- [[Instructions for Linux with GNOME: Ubuntu, Debian, Tails, etc.|reset/linux]]
- [[Instructions for Windows|reset/windows]]
- [[Instructions for Mac OS X|reset/mac]]
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-11-03 18:42+0100\n"
"POT-Creation-Date: 2015-11-18 09:10+0100\n"
"PO-Revision-Date: 2014-06-17 21:33-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -35,3 +35,9 @@ msgstr ""
#. type: Bullet: ' - '
msgid "[[Instructions for Windows|reset/windows]]"
msgstr "[[Instruções para Windows|reset/windows]]"
#. type: Bullet: ' - '
#, fuzzy
#| msgid "[[Instructions for Windows|reset/windows]]"
msgid "[[Instructions for Mac OS X|reset/mac]]"
msgstr "[[Instruções para Windows|reset/windows]]"
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2015-10-26 23:57+0100\n"
"POT-Creation-Date: 2015-11-17 21:32+0100\n"
"PO-Revision-Date: 2015-05-31 23:05+0100\n"
"Last-Translator: spriver <spriver@autistici.org>\n"
"Language-Team: Tails localization discussion <tails-l10n@boum.org>\n"
......@@ -234,9 +234,35 @@ msgid "<pre>tails-upgrade-frontend-wrapper</pre>\n"
msgstr "<pre>tails-upgrade-frontend-wrapper</pre>.\n"
#. type: Plain text
#, fuzzy, no-wrap
msgid "[[!inline pages=\"doc/first_steps/upgrade.release_notes\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/first_steps/upgrade.release_notes\" raw=\"yes\"]]\n"
#, no-wrap
msgid ""
"<!-- Note for translators: make sure that the translation of this string\n"
"integrates well with /inc/stable_i386_release_notes. -->\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<p>We recommend you to read the [[!inline pages=\"inc/stable_i386_release_notes\" raw=\"yes\"]]\n"
"for the latest version. They document all the changes in this new version:</p>\n"
msgstr ""
"<p>Wir empfehlen Ihnen, die [[!inline pages=\"inc/stable_i386_release_notes.de\" raw=\"yes\"]]\n"
"für die neueste Version zu lesen. Sie beschreiben alle Änderungen in dieser neuen Version:</p>\n"
#. type: Plain text
#, 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"
msgstr ""
"<ul>\n"
" <li>Neue Funktionen</li>\n"
" <li>Fehler, die behoben wurden</li>\n"
" <li>Bekannte Probleme, die bereits identifiziert wurden</li>\n"
"</ul>\n"
#. type: Plain text
msgid ""
......@@ -283,6 +309,11 @@ msgstr "<a name=\"manual\"></a>\n"
msgid "Manual upgrade using <span class=\"application\">Tails Installer</span>\n"
msgstr "Manuelles Aktualisieren mit Hilfe des <span class=\"application\">Tails Installers</span>\n"
#. type: Plain text
#, fuzzy, no-wrap
msgid "[[!inline pages=\"doc/first_steps/upgrade.release_notes\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/first_steps/upgrade.release_notes\" raw=\"yes\"]]\n"
#. type: Plain text
#, no-wrap
msgid "They might also contain <strong>special instructions for upgrading</strong>.\n"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2015-10-26 23:57+0100\n"
"POT-Creation-Date: 2015-11-17 21:32+0100\n"
"PO-Revision-Date: 2015-10-19 00:26+0100\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -230,8 +230,34 @@ msgstr "<pre>tails-upgrade-frontend-wrapper</pre>\n"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/first_steps/upgrade.release_notes\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/first_steps/upgrade.release_notes.fr\" raw=\"yes\"]]\n"
msgid ""
"<!-- Note for translators: make sure that the translation of this string\n"
"integrates well with /inc/stable_i386_release_notes. -->\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<p>We recommend you to read the [[!inline pages=\"inc/stable_i386_release_notes\" raw=\"yes\"]]\n"
"for the latest version. They document all the changes in this new version:</p>\n"
msgstr ""
"<p>Nous vous recommandons de lire les [[!inline pages=\"inc/stable_i386_release_notes.fr\" raw=\"yes\"]]\n"
"de la dernière version. Elles documentent tous les changements de cette nouvelle version :</p>\n"
#. type: Plain text
#, 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"
msgstr ""
"<ul>\n"
" <li>nouvelles fonctionnalités</li>\n"
" <li>bugs qui ont été corrigés</li>\n"
" <li>problèmes connus qui ont déjà été identifiés</li>\n"
"</ul>\n"
#. type: Plain text
msgid ""
......@@ -278,6 +304,11 @@ msgstr "<a name=\"manual\"></a>\n"
msgid "Manual upgrade using <span class=\"application\">Tails Installer</span>\n"
msgstr "Installation manuelle avec l'<span class=\"application\">Installeur de Tails</span>\n"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/first_steps/upgrade.release_notes\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/first_steps/upgrade.release_notes.fr\" raw=\"yes\"]]\n"
#. type: Plain text
#, no-wrap
msgid "They might also contain <strong>special instructions for upgrading</strong>.\n"
......
......@@ -93,7 +93,17 @@ command:</p>
<div class="tip">
[[!inline pages="doc/first_steps/upgrade.release_notes" raw="yes"]]
<!-- Note for translators: make sure that the translation of this string
integrates well with /inc/stable_i386_release_notes. -->
<p>We recommend you to read the [[!inline pages="inc/stable_i386_release_notes" raw="yes"]]
for the latest version. They document all the changes in this new version:</p>
<ul>
<li>new features</li>
<li>bugs that were solved</li>
<li>known issues that have already been identified</li>
</ul>
</div>
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-10-26 23:57+0100\n"
"POT-Creation-Date: 2015-11-17 21:32+0100\n"
"PO-Revision-Date: 2014-07-31 15:58-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -221,8 +221,34 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/first_steps/upgrade.release_notes\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/first_steps/upgrade.release_notes.pt\" raw=\"yes\"]]\n"
msgid ""
"<!-- Note for translators: make sure that the translation of this string\n"
"integrates well with /inc/stable_i386_release_notes. -->\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<p>We recommend you to read the [[!inline pages=\"inc/stable_i386_release_notes\" raw=\"yes\"]]\n"
"for the latest version. They document all the changes in this new version:</p>\n"
msgstr ""
"<p>Nós recomendamos que você leia as [[!inline pages=\"inc/stable_i386_release_notes.pt\" raw=\"yes\"]]\n"
"da a última versão. Elas documentam todas as mudanças nesta nova versão:</p>\n"
#. type: Plain text
#, 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"
msgstr ""
"<ul>\n"
" <li>novas funcionalidades</li>\n"
" <li>bugs que foram resolvidos</li>\n"
" <li>problemas conhecidos que já foram identificados</li>\n"
"</ul>\n"
#. type: Plain text
msgid ""
......@@ -267,6 +293,11 @@ msgstr "<a id=\"manual\"></a>\n"
msgid "Manual upgrade using <span class=\"application\">Tails Installer</span>\n"
msgstr "Atualização manual usando o <span class=\"application\">Tails Installer</span>\n"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/first_steps/upgrade.release_notes\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/first_steps/upgrade.release_notes.pt\" raw=\"yes\"]]\n"
#. type: Plain text
#, no-wrap
msgid "They might also contain <strong>special instructions for upgrading</strong>.\n"
......
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-08-18 18:34+0300\n"
"PO-Revision-Date: 2015-05-30 12:32+0100\n"
"Last-Translator: spriver <spriver@autistici.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
#. type: Content of: <p>
msgid ""
"We recommend you to read the [[!inline pages=\"inc/stable_i386_release_notes"
"\" raw=\"yes\"]] for the latest version. They document all the changes in "
"this new version:"
msgstr ""
"Wir empfehlen Ihnen, die [[!inline pages=\"inc/stable_i386_release_notes.de"
"\" raw=\"yes\"]] für die neueste Version zu lesen. Sie beschreiben alle "
"Änderungen in dieser neuen Version:"
#. type: Content of: <ul><li>
msgid "new features"
msgstr "Neue Funktionen"
#. type: Content of: <ul><li>
msgid "bugs that were solved"
msgstr "Fehler, die behoben wurden"
#. type: Content of: <ul><li>
msgid "known issues that have already been identified"
msgstr "Bekannte Probleme, die bereits identifiziert wurden"
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-08-18 18:34+0300\n"
"PO-Revision-Date: 2014-10-08 09:42-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
#. type: Content of: <p>
msgid ""
"We recommend you to read the [[!inline pages=\"inc/stable_i386_release_notes"
"\" raw=\"yes\"]] for the latest version. They document all the changes in "
"this new version:"
msgstr ""
"Nous vous recommandons de lire les [[!inline pages=\"inc/"
"stable_i386_release_notes.fr\" raw=\"yes\"]] de la dernière version. Elles "
"documentent tous les changements de cette nouvelle version :"
#. type: Content of: <ul><li>
msgid "new features"
msgstr "nouvelles fonctionnalités"
#. type: Content of: <ul><li>
msgid "bugs that were solved"
msgstr "bugs qui ont été corrigés"
#. type: Content of: <ul><li>
msgid "known issues that have already been identified"
msgstr "problèmes connus qui ont déjà été identifiés"
<!-- Note for translators: make sure that the translation of this string
integrates well with /inc/stable_i386_release_notes. -->
<p>We recommend you to read the [[!inline pages="inc/stable_i386_release_notes" raw="yes"]]
for the latest version. They document all the changes in this new version:</p>
<ul>
<li>new features</li>
<li>bugs that were solved</li>
<li>known issues that have already been identified</li>
</ul>
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-08-18 18:34+0300\n"
"PO-Revision-Date: 2014-07-30 19:25-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: <p>
msgid ""
"We recommend you to read the [[!inline pages=\"inc/stable_i386_release_notes"
"\" raw=\"yes\"]] for the latest version. They document all the changes in "
"this new version:"
msgstr ""
"Nós recomendamos que você leia as [[!inline pages=\"inc/"
"stable_i386_release_notes.pt\" raw=\"yes\"]] da a última versão. Elas "
"documentam todas as mudanças nesta nova versão:"
#. type: Content of: <ul><li>
msgid "new features"
msgstr "novas funcionalidades"
#. type: Content of: <ul><li>
msgid "bugs that were solved"
msgstr "bugs que foram resolvidos"
#. type: Content of: <ul><li>
msgid "known issues that have already been identified"
msgstr "problemas conhecidos que já foram identificados"
......@@ -96,7 +96,7 @@
<div id="download">
<a id="download-button" href='[[!inline pages="inc/stable_i386_iso_url" raw="yes"]]' class="btn btn-lg btn-primary clearfix iso-url">
<span id="download-button-label" class="pull-left">Download Tails <span class="iso-version">[[!inline pages="inc/stable_i386_version" raw="yes"]]</span> ISO image
<small id="download-button-size" class="iso-url-text">(<span class="iso-size-MiB">$SIZE</span>)</small>
<small id="download-button-size">(<span class="iso-size-MiB">$SIZE</span> MiB)</small>
</span>
</a>
<div id="download-text" class="btn btn-lg clearfix">
......@@ -151,8 +151,7 @@
<div id="verify-text" class="btn btn-lg clearfix">
<div class="pull-left">
<div id="verify-text-label">Verify ISO image</div>
<small id="verify-text-calculating">Computing SHA-256 checksum for <span class="verify-file-path"></span>...</small>
<div id="verify-text-computed-hash" class="iso-computed-hash"></div>
<small id="verify-text-calculating">Computing SHA-256 checksum&hellip;</small>
</div>
<div id="verify-text-state" class="pull-right">
<span id="verify-text-state-calculating" class="state calculating label label-info"><span class="verify-progress">$PROGRESS</span></span>
......@@ -173,6 +172,7 @@
<span class="btn btn-lg btn-primary mac-clone">[[Next <span>Open these instructions on another device</span>|install/mac/clone]]</span>
<span class="btn btn-lg btn-primary upgrade-clone">[[Next <span>Open these instructions on another device</span>|upgrade/clone]]</span>
<span class="btn btn-lg btn-primary upgrade-tails">[[Next <span>Install a temporary Tails</span>|upgrade/tails]]</span>
<a href="" class="btn btn-lg btn-link">Download again</a>
</div>
<div id="verify-text-failure" class="bg-warning">
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-06-28 21:22+0200\n"
"POT-Creation-Date: 2015-11-17 21:44+0100\n"
"PO-Revision-Date: 2015-05-30 12:28+0100\n"
"Last-Translator: spriver <spriver@autistici.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Poedit 1.5.4\n"
#. Note for translators: make sure that the translation of this link
#. integrates well with /doc/first_steps/upgrade.release_notes.
#. integrates well with /doc/first_steps/upgrade.
#. type: Content of: outside any tag (error?)
msgid "[[release notes|news/version_1.7]]"
msgstr "[[Versionshinweise|news/version_1.7]]"
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-07-30 11:24+0200\n"
"POT-Creation-Date: 2015-11-17 21:44+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"
......@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. Note for translators: make sure that the translation of this link
#. integrates well with /doc/first_steps/upgrade.release_notes.
#. integrates well with /doc/first_steps/upgrade.
#. type: Content of: outside any tag (error?)
msgid "[[release notes|news/version_1.7]]"
msgstr ""
<!-- Note for translators: make sure that the translation of this link
integrates well with /doc/first_steps/upgrade.release_notes. -->
integrates well with /doc/first_steps/upgrade. -->
[[release notes|news/version_1.7]]
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-09-01 00:03+0300\n"
"POT-Creation-Date: 2015-11-17 21:44+0100\n"
"PO-Revision-Date: 2014-07-30 19:25-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. Note for translators: make sure that the translation of this link
#. integrates well with /doc/first_steps/upgrade.release_notes.
#. integrates well with /doc/first_steps/upgrade.
#. type: Content of: outside any tag (error?)
msgid "[[release notes|news/version_1.7]]"
msgstr "[[notas de lançamento|news/version_1.7]]"
......@@ -13,4 +13,6 @@
[[!inline pages="install/inc/steps/restart_second_time.inline" raw="yes"]]
[[!inline pages="install/inc/steps/you_are_done.inline" raw="yes"]]
[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]
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