summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2018-03-16 21:29:36 +0000
committerintrigeri <intrigeri@boum.org>2018-03-16 21:29:36 +0000
commit8dbc18828bfebf169ece64b1ca00d14ddef4ab0a (patch)
tree0c0740d42f76d875fcb07c78dbc2f75e03292a73
parente70fe76d0a70920231bbd5d6dffc54f0fc67a31b (diff)
parentd44707ac06e0ae87f749b3b88e91fbc7505be13a (diff)
Merge remote-tracking branch 'origin/master' into stable
-rw-r--r--wiki/src/blueprint/additional_software_packages/gui.mdwn28
-rw-r--r--wiki/src/contribute/release_process.mdwn2
-rw-r--r--wiki/src/contribute/release_process/tor-browser.mdwn5
-rw-r--r--wiki/src/index.pt.po18
4 files changed, 39 insertions, 14 deletions
diff --git a/wiki/src/blueprint/additional_software_packages/gui.mdwn b/wiki/src/blueprint/additional_software_packages/gui.mdwn
index 0a90da5..cfd7016 100644
--- a/wiki/src/blueprint/additional_software_packages/gui.mdwn
+++ b/wiki/src/blueprint/additional_software_packages/gui.mdwn
@@ -105,6 +105,12 @@ installing.
XXX: the configure button here is tricky to implement. Can we live without it?
+> People who see this notification already configured additional
+> software. It's here as a reminder of where the configuration that
+> triggers this notification is stored (and also as a shortcut).
+>
+> So yes, we can live without it.
+
Notifications of failures
-------------------------
@@ -120,6 +126,25 @@ Notifications of failures
XXX: please define
+> I would need to understand better how and why it could fail... Is it
+> something that people can fix by themselves or merely revealing a bug
+> that we will have to fix in Tails?
+>
+> If it's about helping people to report bugs that we will have to fix
+> in Tails, then we could display:
+
+<pre>
+**Adding Mumble to your additional software failed**
+
+Please [[report an error to our help desk|doc/first_steps/bug_reporting]].
+</pre>
+
+<pre>
+**Removing Mumble from your additional software failed**
+
+Please [[report an error to our help desk|doc/first_steps/bug_reporting]].
+</pre>
+
### When the *Additional Software* configuration GUI fails to do its work
* started standalone (from the Applications menu or Overview)
@@ -152,6 +177,9 @@ Software** feature in the persistent storage settings.
XXX: please define what happens when clicking on the links "Synaptic Package Manager" or "APT on the command line".
+> Clicking "Synaptic Package Manager" opens Synaptic.
+> Clicking "APT on the command line" opens Terminal.
+
### When removing a package
By clicking on the delete cross.
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 5d6a0cf..be83d0d 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -130,7 +130,7 @@ If we are at freeze time for a point-release:
1. Merge the `master` Git branch into `stable`:
- git checkout stable && git merge --no-ff origin/master
+ git checkout stable && git fetch && git merge --no-ff origin/master
2. [[Merge each APT overlay suite|APT_repository/custom#workflow-merge-overlays]]
listed in the `stable` branch's `config/APT_overlays.d/` into the `stable`
diff --git a/wiki/src/contribute/release_process/tor-browser.mdwn b/wiki/src/contribute/release_process/tor-browser.mdwn
index 81b7cee..2f1e4e1 100644
--- a/wiki/src/contribute/release_process/tor-browser.mdwn
+++ b/wiki/src/contribute/release_process/tor-browser.mdwn
@@ -66,8 +66,9 @@ with GnuPG:
Filter the tarballs we want and make them available at build time,
when the tarballs are fetched:
- grep --color=never "\<tor-browser-linux64-.*\.tar.xz$" sha256sums-unsigned-build.txt > \
- config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
+ grep --color=never "\<tor-browser-linux64-.*\.tar.xz$" sha256sums-unsigned-build.txt \
+ | grep -v '\<tor-browser-linux64-debug\.tar\.xz$' \
+ > config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
Then update the URL to the one chosen above:
diff --git a/wiki/src/index.pt.po b/wiki/src/index.pt.po
index c52e9c5..d11c402 100644
--- a/wiki/src/index.pt.po
+++ b/wiki/src/index.pt.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: tails-index-pt\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2018-03-12 14:36+0100\n"
-"PO-Revision-Date: 2018-02-21 10:55+0000\n"
+"PO-Revision-Date: 2018-03-14 01:08-0300\n"
"Last-Translator: drebs <drebs@riseup.net>\n"
"Language-Team: Portuguese <LL@li.org>\n"
"Language: pt\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.10.1\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Content of: outside any tag (error?)
msgid ""
@@ -56,8 +56,8 @@ msgid ""
"all connections to the Internet are forced to go through [[the Tor network|"
"https://www.torproject.org/]];"
msgstr ""
-"todas as conexões feitas à Internet são passam necessariamente [[pela rede "
-"Tor|https://www.torproject.org/]];"
+"todas as conexões feitas à Internet passam necessariamente [[pela rede Tor|"
+"https://www.torproject.org/]];"
#. type: Content of: <div><ul><li>
msgid ""
@@ -73,7 +73,7 @@ msgid ""
"files, emails and instant messaging."
msgstr ""
"<strong>usar ferramentas criptográficas do estado da arte</strong> para "
-"criptografar seus arquivos, email e mensagens instantâneas."
+"criptografar seus arquivos, emails e mensagens instantâneas."
#. type: Content of: <div><p>
msgid "[[Learn more about Tails.|about]]"
@@ -155,20 +155,16 @@ msgid ""
msgstr ""
"Tails envia seu tráfego pelo <a href=\"https://torproject.org/\">Tor</a>."
-#. #debian-fs-tor
+#. #debian-fs-tor
#. type: Content of: outside any tag (error?)
msgid "<span class=\"clearfix\"></span>"
msgstr "<span class=\"clearfix\"></span>"
#. type: Content of: <div><h1>
msgid "Awards"
-msgstr "Prêmios"
+msgstr "Premiações"
#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "Tails has received the Mozilla Open Source Support Award (2016), the "
-#| "Access Innovation Prize (2014) and the OpenITP award (2013)."
msgid ""
"Tails has received the Mozilla Open Source Support Award (2016), the Access "
"Innovation Prize (2014), the APC FLOSS prize (2014) and the OpenITP award "