Commit f582e425 authored by Tails developers's avatar Tails developers
Browse files

Merge branch 'master' of ssh://webmasters.boum.org/~/wiki

parents 2be575cb b061e351
......@@ -200,7 +200,7 @@ po_slave_languages:
- fr|Français
- pt|Português
# PageSpec controlling which pages are translatable
po_translatable_pages: '!security/audits and !security/audits/* and (about or bugs or chat or contribute or doc or doc/* or download or getting_started or inc/stable_i386_date or index or news or news/* or press or press/* or security or security/* or sidebar or support or support/* or todo or torrents or wishlist or misc or misc/*)'
po_translatable_pages: '!security/audits and !security/audits/* and (about or bugs or chat or contribute or doc or doc/* or download or getting_started or inc/stable_i386_date or inc/stable_i386_release_notes or index or news or news/* or press or press/* or security or security/* or sidebar or support or support/* or todo or torrents or wishlist or misc or misc/*)'
# internal linking behavior (default/current/negotiated)
po_link_to: current
......
......@@ -37,7 +37,7 @@ http_proxy="" gpg --keyserver hkps.pool.sks-keyservers.net --recv-key C7988EA7A3
gpg --export C7988EA7A358D82E | sudo apt-key add -
# Add unstable repository for ikiwiki, and pin it low
echo 'deb http://http.us.debian.org/debian unstable main' > /etc/apt/sources.list.d/unstable.list
echo 'deb http://ftp.us.debian.org/debian unstable main' > /etc/apt/sources.list.d/unstable.list
sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/unstable <<EOF
Package: *
Pin: release a=unstable
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-05-11 17:38+0200\n"
"POT-Creation-Date: 2014-07-25 21:32+0300\n"
"PO-Revision-Date: 2014-06-14 20:24-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -466,6 +466,10 @@ msgstr ""
msgid "Active projects"
msgstr "Aktive Projekte"
#. type: Bullet: '* '
msgid "[SubgraphOS](https://subgraph.com/sgos/)"
msgstr ""
#. type: Bullet: '* '
msgid "[Freepto](http://www.freepto.mx/)"
msgstr "[Freepto](http://www.freepto.mx/)"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: tails-about-fr\n"
"POT-Creation-Date: 2014-05-11 17:38+0200\n"
"POT-Creation-Date: 2014-07-25 21:32+0300\n"
"PO-Revision-Date: 2013-10-13 17:08-0000\n"
"Last-Translator: \n"
"Language-Team: \n"
......@@ -461,6 +461,10 @@ msgstr ""
msgid "Active projects"
msgstr "Projets actif"
#. type: Bullet: '* '
msgid "[SubgraphOS](https://subgraph.com/sgos/)"
msgstr ""
#. type: Bullet: '* '
#, fuzzy
#| msgid "[Odebian](http://www.odebian.org/)"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 1\n"
"POT-Creation-Date: 2014-05-26 12:14+0200\n"
"POT-Creation-Date: 2014-07-25 21:32+0300\n"
"PO-Revision-Date: 2014-04-30 20:00-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: Portuguese <LL@li.org>\n"
......@@ -284,9 +284,9 @@ msgid ""
"span>, the Linux standard for disk-encryption."
msgstr ""
"[[Criptografe sua memória USB ou disco rígido externo|doc/"
"encryption_and_privacy/encrypted_volumes]] usando <span class=\"definition"
"\">[[!wikipedia LUKS]]</span>, a ferramenta padrão do Linux para "
"criptografia de disco."
"encryption_and_privacy/encrypted_volumes]] usando <span class=\"definition\">"
"[[!wikipedia LUKS]]</span>, a ferramenta padrão do Linux para criptografia "
"de disco."
#. type: Bullet: ' - '
msgid ""
......@@ -465,6 +465,10 @@ msgstr ""
msgid "Active projects"
msgstr "Projetos ativos"
#. type: Bullet: '* '
msgid "[SubgraphOS](https://subgraph.com/sgos/)"
msgstr ""
#. type: Bullet: '* '
msgid "[Freepto](http://www.freepto.mx/)"
msgstr "[Freepto](http://www.freepto.mx/)"
......
[[!toc levels=2]]
Design by design
================
Tails is designed to be an easy-to-use Live operating system as well as a toolkit for privacy and anonymity for the masses.
We organized several workshops at NUMA to improve the usability of Tails. We realized that it is hard for people who are not tech-savvy and/or new to Tails:
- to understand what Tails is;
- to install Tails;
- to boot Tails.
We want to improve this situation.
First-time visitors on the Tails website should be able to enjoy a consistent experience, from understanding if Tails is the right tool for them, to achieving their actual goals by using it.
From the inside, to the outside
===============================
We want to go from the inside to the outside, from the skeleton to the surface. E.g. having a rocking website _first_ might lead potential users to think that Tails is easy enough for them, while it is not the case yet, which could be problematic in some cases.
This is why, hereafter you will find a description of the logical order of steps. Of course, we can still work simultaneously on all of these steps, *but* it is useful to keep the whole roadmap in mind along the way.
1. Inside
---------
- Greeter revamp (High) [[!tails_ticket 5464]]
- Network connection feedback [[!tails_ticket 7437]]
- MAT [[!tails_ticket 7684 ]]
- OTR [[!tails_ticket 7348 ]]
- Shut down [[!tails_ticket 5417 ]]
2. Installation
---------------
1. Refactor the installation documentation and add visual aids (installation screencast etc.)
2. Automatic ISO verification [[!tails_ticket 7552]]
3. Multiplatform installer [[!tails_ticket 7544]]
3. Website
----------
- Re-define the goals of the website and maybe split it in differents sections [[!tails_ticket 7627]]
- work on accessibility
4. Outreach
-----------
- Promote Tails outside of the website, regarding the differents people and use cases where Tails could be usefull.
......@@ -8,3 +8,6 @@ Todo/discuss
* https://labs.riseup.net/code/issues/6972 Create a "Sponsors" page
* https://labs.riseup.net/code/issues/7521 Export iCal calendar from ikiwiki?
* https://labs.riseup.net/code/issues/7638 Decide something about the
proposed plan regarding TrueCrypt
......@@ -11,18 +11,26 @@ Tails can be built easily in a virtual machine using [Rake], [Vagrant] and
[VirtualBox]. The process requires a minimum of 1 GB of free memory and a
maximum of 10 GB of free storage.
Install the needed tools on Debian Jessie:
[Rake]: http://rake.rubyforge.org/
[Vagrant]: http://vagrantup.com/
[VirtualBox]: http://www.virtualbox.org/
Set up the build environment on Debian Jessie:
$ sudo apt-get install git virtualbox rake vagrant/unstable
1. Add Debian unstable to your APT sources.
2. Pin all packages from Debian unstable at 500 (`apt_preferences(5)`).
3. Install the needed tools:
$ sudo apt-get install git virtualbox rake vagrant/unstable
Or, on Debian Wheezy:
$ sudo apt-get install git virtualbox rake vagrant/unstable \
ruby-childprocess/jessie ruby-net-scp/jessie ruby-net-ssh/jessie
1. Add Debian Jessie and unstable to your APT sources.
2. Pin all packages from Debian Jessie and unstable at 500 (`apt_preferences(5)`).
3. Install the needed tools:
[Rake]: http://rake.rubyforge.org/
[Vagrant]: http://vagrantup.com/
[VirtualBox]: http://www.virtualbox.org/
$ sudo apt-get install git virtualbox rake vagrant/unstable \
ruby-childprocess/jessie ruby-net-scp/jessie ruby-net-ssh/jessie
Then, please run:
......@@ -221,10 +229,13 @@ Build process
Every build command must be run as `root`, at the root of a clone of the
[[`tails` repository|git]].
In short, a build could be done using:
In short, a build shall be done using:
# lb clean --all && lb config && lb build
Running `lb config` or `lb build` in an environment that wasn't full
cleaned first is not supported.
### Customize the build process if needed
If you need to set custom build settings that are specific to your
......@@ -238,23 +249,13 @@ The most common customizations are documented on this wiki:
build environment;
* [[using a custom Debian mirror to build Tails
images|build/custom_mirror]];
* [[using squid-deb-proxy to build Tails images|build/squid-deb-proxy]].
* [[using squid-deb-proxy to build Tails images|build/squid-deb-proxy]]
(**Note**: most Tails contributors using the manual build method
use [[!debpts apt-cacher-ng]] instead, nowadays.)
More documentation about this can be found in the [Debian Live
Manual](http://live.debian.net/manual-2.x/html/live-manual.en.html).
### Initialize the Live system's configuration
Initialize the Live system's configuration with `lb config` in a
**clean** build tree. Most `lb config` options are supported, have a
look to the `lb_config(1)` manpage for details.
### Build the system
You can then use the standard live-build commands as root to build
the image (`lb build`) and to cleanup the build directory (`lb
clean`).
More information
================
......
[[!meta title="Calendar"]]
* 2014-07-01: Feature freeze for 1.1. Tag, build and upload 1.1~rc1
ISO.
* 2014-08-03, 7pm UTC (9pm CEST): Tails contributors meeting
(`#tails-meeting` on `irc.indymedia.org` / `h7gf2ha3hefoj5ls.onion`)
* 2014-07-02: Test Tails 1.1~rc1.
* 2014-08-12: Freeze Tails 1.1.1.
* 2014-07-03: Officially release Tails 1.1~rc1.
* 2014-08-13: build Tails 1.1.1~rc1.
* 2014-07-05--2014-07-06 - Tails hackfest at
[IRILL](http://www.irill.org/) (Paris, France)
* 2014-08-14: test Tails 1.1.1~rc1.
* 2014-07-08--2014-07-11 - Tails contributors meeting
* 2014-07-20: Package and upload Firefox 24.7.0 ESR. Tag, build and
upload 1.1 ISO.
* 2014-07-21: Test Tails 1.1.
* 2014-07-22: Officially release Tails 1.1.
* 2014-08-15: release Tails 1.1.1~rc1.
* 2014-09-02: Release Tails 1.1.1. intrigeri does the first ~half of
the RM duty, anonym takes over around 2014-08-20.
......
......@@ -682,7 +682,7 @@ fitness for a particular purpose, including total anonymity. Anonymity
depends not only on the software but also on the user understanding
the risks involved and how to manage those risks.
Other Tails design documents:
## 3.0 Other Tails design documents
[[!map pages="contribute/design/*"]]
......
#!/bin/sh
set -e
set -u
PROJECTS="liveusb-creator tails-greeter tails-iuk tails-misc tails-perl5lib tails-persistence-setup whisperback"
GIT_TOPLEVEL_DIR=$(git rev-parse --show-toplevel)
TOR_TRANSLATION_DIR="$GIT_TOPLEVEL_DIR/tmp/tor-translation"
(
cd "$TOR_TRANSLATION_DIR"
for project in $PROJECTS; do
for branch in "$project" "${project}_completed"; do
git checkout --quiet "$branch"
git reset --quiet --hard "origin/$branch"
git grep -H 'Last-Translator' | grep -v '^templates/' \
| sed -e 's/^\([A-Za-z_]\+\)\/\1\.po:"Last-Translator: \(.\+\)\\n"$/\1 \2/' \
| grep -Ev '(FULL NAME|tor-assistants@torproject.org|colin@torproject.org|runa.sandvik@gmail.com|support-team-private@lists.torproject.org|<>)'
done
done | sort -u
)
......@@ -41,7 +41,4 @@ On the APT repository side,
committed*; else, ask the branch submitter to split the remaining tasks
into other tickets.
1. Push the updated branch to the master Git repository.
1. If you merged into a branch that is built by [our
Jenkins](https://jenkins.tails.boum.org/), also push it to the Git
repository on lizard (`gitolite@git.puppet.tails.boum.org:tails`).
1. Reply to the email that requested the review.
......@@ -16,8 +16,8 @@ the scripts snippets found on this page:
export TAG=$(echo "$VERSION" | sed -e 's,~,-,')
export PREVIOUS_VERSION=$(dpkg-parsechangelog --offset 1 --count 1 -SVersion)
* `NEXT_VERSION`: set to the version number of the next Tails release
(e.g. 0.23 when releasing 0.22.1)
* `NEXT_MAJOR_VERSION`: set to the version number of the next Tails release
(e.g. 0.23 when releasing 0.22.1, and 1.3 when releasing 1.2)
* `MAJOR_RELEASE`: set to 1 if preparing a major release, to 0 else
* `ISOS`: the directory where one stores `tails-i386-*`
sub-directories like the ones downloaded with BitTorrent.
......@@ -204,6 +204,7 @@ matches the date of the future signature.
echo "$VERSION" > wiki/src/inc/stable_i386_version.html
echo "$RELEASE_DATE" > wiki/src/inc/stable_i386_date.html
sed -ri "s%news/version_.*]]%news/version_$VERSION]]%" wiki/src/inc/stable_i386_release_notes.*
$EDITOR wiki/src/inc/*.html
./build-wiki
git commit wiki/src/inc/ -m "Update version and date for $VERSION."
......@@ -364,7 +365,7 @@ Use `tails-create-iuk` to build the following IUKs:
1.0. This should be done even if there was no IUK generated from the
previous stable release since it is a good way to test the iuk code
that'll be used for the incremental upgrade paths to the
`$NEXT_VERSION`.
next version.
Example (for RC, replace `$PREVIOUS_VERSION` with e.g. `$VERSION~rc1`
below):
......@@ -404,8 +405,10 @@ Prepare upgrade-description files
( cd $IUK_CHECKOUT && \
./bin/tails-iuk-generate-upgrade-description-files \
--version "$VERSION" \
--next-version "$NEXT_VERSION" \
--next-version "${NEXT_VERSION}~rc1" \
--next-version "$NEXT_MAJOR_VERSION" \
--next-version "${NEXT_MAJOR_VERSION}~rc1" \
--next-version "${VERSION}.1" \
--next-version "${VERSION}.1~rc1" \
--iso "$ISOS/tails-i386-$VERSION/tails-i386-$VERSION.iso" \
--previous-version "$PREVIOUS_VERSION" \
--previous-version "${VERSION}~rc1" \
......@@ -424,8 +427,12 @@ Prepare upgrade-description files
`--previous-version`, so that users who skipped a release or two
are directly informed of the new one.
* If preparing a release candidate, add `--channel alpha`
* If preparing a release candidate, do not pass
`--next-version "${NEXT_VERSION}~rc1"`
* If preparing a release candidate, drop all `--next-version`
arguments, and instead pass (**untested!**)
`--next-version $(echo $VERSION | sed -e 's,~rc*$,,')`
* If preparing a point-release, pass neither
`--next-version "${VERSION}.1"`,
nor `--next-version "${VERSION}.1~rc1"`
1. Create an armoured detached signature for each created or modified
upgrade-description file.
......@@ -784,14 +791,7 @@ this, and skip what does not make sense for a RC.
done
- `git push --force origin experimental`
1. Push the release tag to lizard for Jenkins' consumption: `git push --tags lizard`
1. Force-push all major branches to lizard:
for branch in stable testing devel experimental ; do
git push --force lizard $branch:$branch
done
1. Make sure Jenkins manages to build all major branches fine:
1. Make sure Jenkins manages to build all updated major branches fine:
<https://jenkins.tails.boum.org/>.
1. Delete the _Release Manager View for $VERSION_ Redmine custom query.
1. Ensure the next few releases have their own _Release Manager View_.
......
......@@ -17,7 +17,10 @@ User support
General communication watchdog
------------------------------
- Try to do something about the [new tickets](https://labs.riseup.net/code/projects/tails/issues?query_id=148) in Redmine.
- Try to do something about the
[new tickets](https://labs.riseup.net/code/projects/tails/issues?query_id=157)
that appear in Redmine. An Atom feed is available for easier
monitoring, see the link at the bottom of that page.
- Administer and moderate our general purpose public mailing lists:
- [tails-dev@boum.org](https://mailman.boum.org/admin/tails-dev)
- [tails-l10n@boum.org](https://mailman.boum.org/admin/tails-l10n)
......
......@@ -19,8 +19,9 @@
## Around two weeks before the freeze
- Have a look at recent changes in:
* the [TBB](https://gitweb.torproject.org/torbrowser.git)'s prefs
(e.g. `git log -p build-scripts/config/*.js`)
* the prefs shipped as part of the [Tor Browser build
scripts](https://git.torproject.org/builders/tor-browser-bundle.git)
(e.g. `git log -p Bundle-Data/linux/Data/Browser/profile.default/preferences/*.js`)
* the [Tor Browser](https://git.torproject.org/tor-browser.git)
patch that creates `browser/app/profile/000-tor-browser.js`:
......@@ -37,9 +38,6 @@
- Import the relevant changes into our Iceweasel configuration,
following the normal review'n'merge process.
- In particular, make sure the `general.*` and
`browser.startup.homepage_override.*` prefs are in sync', in our
`/etc/iceweasel/pref/iceweasel.js`, with TBB's `pound_tor.js`.
- Have a look at recent changes
in [Torbutton](https://gitweb.torproject.org/torbutton.git), and
do whatever is needed to get the fixes we need in the release.
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-05-25 11:15+0200\n"
"POT-Creation-Date: 2014-07-25 21:32+0300\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"
......@@ -149,6 +149,15 @@ msgstr ""
msgid "<h2 class=\"bullet-number-three\">Do the copy</h2>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<ul>\n"
"<li><strong>All the data on the installed device will be\n"
"lost.</strong></li>\n"
"</ul>\n"
msgstr ""
#. type: Plain text
msgid ""
"Execute the following commands, replacing `[tails.iso]` with the path to the "
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSIONx\n"
"POT-Creation-Date: 2014-07-21 03:22+0300\n"
"POT-Creation-Date: 2014-07-25 21:32+0300\n"
"PO-Revision-Date: 2013-10-28 01:44-0000\n"
"Last-Translator: \n"
"Language-Team: GANGUALE <LL@li.org>\n"
......@@ -173,6 +173,15 @@ msgstr ""
msgid "<h2 class=\"bullet-number-three\">Do the copy</h2>\n"
msgstr "<h2 class=\"bullet-number-three\">Faire la copie</h2>\n"
#. type: Plain text
#, no-wrap
msgid ""
"<ul>\n"
"<li><strong>All the data on the installed device will be\n"
"lost.</strong></li>\n"
"</ul>\n"
msgstr ""
#. type: Plain text
msgid ""
"Execute the following commands, replacing `[tails.iso]` with the path to the "
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-05-25 11:15+0200\n"
"POT-Creation-Date: 2014-07-25 21:32+0300\n"
"PO-Revision-Date: 2013-04-12 12:02+0200\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -180,6 +180,15 @@ msgstr "<a id=\"step_3\"></a>\n"
msgid "<h2 class=\"bullet-number-three\">Do the copy</h2>\n"
msgstr "<h2 class=\"bullet-number-three\">Faça a cópia</h2>\n"
#. type: Plain text
#, no-wrap
msgid ""
"<ul>\n"
"<li><strong>All the data on the installed device will be\n"
"lost.</strong></li>\n"
"</ul>\n"
msgstr ""
#. type: Plain text
#, fuzzy
#| msgid ""
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-07-24 23:22+0300\n"
"POT-Creation-Date: 2014-07-30 11:24+0200\n"
"PO-Revision-Date: 2014-04-14 22:41+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -155,6 +155,16 @@ msgid ""
"and follow the assistant through the upgrade process.\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<div class=\"tip\">\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/first_steps/upgrade.release_notes\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
msgid ""
"If an error occurs, the assistant proposes you to read one of the following "
......@@ -190,7 +200,8 @@ msgid "Manual upgrade using <span class=\"application\">Tails Installer</span>\n
msgstr ""
#. type: Plain text
msgid "Read the latest [[release notes|news/version_1.1]] first."
#, no-wrap
msgid "They might also contain <strong>special instructions for upgrading</strong>.\n"
msgstr ""
#. type: Plain text
......@@ -245,11 +256,6 @@ msgid ""
"Installer</span> from another media than the device that you want to upgrade.\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<div class=\"tip\">\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2014-07-24 23:22+0300\n"
"POT-Creation-Date: 2014-07-30 11:24+0200\n"
"PO-Revision-Date: 2014-07-24 18:07+0200\n"
"Last-Translator: saegor <saegor@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -192,6 +192,16 @@ msgstr ""
"Si vous voulez faire la mise à jour, cliquez sur <span class=\"guilabel\">Mettre à jour maintenant</span>,\n"
"et suivez l'assistant à travers le processus de mise à jour.\n"
#. type: Plain text
#, no-wrap
msgid "<div class=\"tip\">\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/first_steps/upgrade.release_notes\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
msgid ""
"If an error occurs, the assistant proposes you to read one of the following "
......@@ -238,7 +248,8 @@ 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
msgid "Read the latest [[release notes|news/version_1.1]] first."
#, no-wrap
msgid "They might also contain <strong>special instructions for upgrading</strong>.\n"
msgstr ""
#. type: Plain text
......@@ -313,11 +324,6 @@ msgstr ""
"<span class=\"application\">Installeur de Tails</span> à partir d'un autre média que\n"
"celui que vous souhaitez mettre à jour.\n"
#. type: Plain text
#, no-wrap
msgid "<div class=\"tip\">\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
......
Markdown is supported
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