Merge branch 'devel' into squeeze

Conflicts:
	config/chroot_apt/preferences

auto/config

@@ -27,7 +27,6 @@ $RUN_LB_CONFIG \
    --iso-volume="TAILS ${AMNESIA_FULL_VERSION}" \
    --memtest none \
    --packages-lists="standard" \
-   --repositories="live.debian.net" \
    --syslinux-menu vesamenu \
    --syslinux-timeout 4 \
    ${@}

config/amnesia

@@ -165,7 +165,7 @@ AMNESIA_VERSION="`dpkg-parsechangelog | sed -n 's/^Version: //p'`"
 AMNESIA_FULL_VERSION="${AMNESIA_VERSION} - ${AMNESIA_TODAY} - Squeeze"
 
 # Developpers' data used by git-dch, debcommit and friends in the release script
-AMNESIA_DEV_FULLNAME="amnesia"
+AMNESIA_DEV_FULLNAME='T(A)ILS developers'
 AMNESIA_DEV_EMAIL="amnesia@boum.org"
 AMNESIA_DEV_KEYID="BE2CD9C1"
 

config/chroot_apt/preferences

-Package: live-build
-Pin: origin live.debian.net
-Pin-Priority: 999
-
-Package: live-config
-Pin: origin live.debian.net
-Pin-Priority: 999
-
-Package: live-config-sysvinit
-Pin: origin live.debian.net
-Pin-Priority: 999
-
 Explanation: weirdness in chroot_apt install-binary
 Package: *
 Pin: release o=chroot_local-packages

config/chroot_local-includes/etc/NetworkManager/dispatcher.d/50-htp.sh

@@ -26,6 +26,11 @@
 # as the htp user all operations but the actual setting of time, which
 # has to be done as root.
 
+# Run only when the interface is not "lo":
+if [[ $1 = "lo" ]]; then
+   exit 0
+fi
+
 # Run whenever an interface gets "up", not otherwise:
 if [[ $2 != "up" ]]; then
 	exit 0

config/chroot_local-includes/usr/local/bin/tails-start-i2p

+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+#man{{{
+
+=head1 NAME
+
+tails-htp-notify-user
+
+=head1 VERSION
+
+Version X.XX
+
+=head1 AUTHOR
+
+T(A)ILS dev team <amnesia@boum.org>
+See https://amnesia.boum.org/.
+
+=cut
+
+#}}}
+
+use Desktop::Notify;
+use Locale::gettext;
+use POSIX;
+
+### initialization
+setlocale(LC_MESSAGES, "");
+textdomain("tails-i2p-notify-user");
+
+### helper subs
+
+# TODO: get router port (default 7657) from /etc/i2p/clients.config
+sub get_router_port {
+    return 7657;
+}
+
+# TODO: more perlish way to do below?
+# TODO: use netstat -p, check that a child of i2psvc runs the router console
+sub router_status {
+    return !system("netstat -nl -A inet,inet6 | grep -q -e \"\\(\\(127\\.0\\.0\\.1\\)\\|\\(::1\\)\\):" . get_router_port() . "\"");
+}
+
+sub open_router_console {
+    system("/usr/bin/iceweasel http://127.0.0.1:" . get_router_port());
+}
+
+sub start_i2psvc {
+    system("/usr/bin/gksu /etc/init.d/i2p start");
+}
+
+sub stop_i2psvc {
+    system("/usr/bin/gksu /etc/init.d/i2p start");
+}  
+
+### main
+
+my $notify = Desktop::Notify->new();
+
+my $summary = gettext("Starting I2P...");
+my $body    = gettext("The I2P router console will be opened on start.");
+
+my $notification = $notify->create(summary => $summary,
+                                   body => $body,
+                                   timeout => 0);
+
+start_i2psvc();
+
+$notification->show();
+
+my $t = 0;
+my $timeout = 60;
+while ($t < $timeout && !router_status()) {
+    $t++;
+    sleep 1;
+}
+
+$notification->close();
+
+if (router_status()) {
+    open_router_console();
+    exit 0;
+} else {
+    stop_i2psvc();
+
+    $summary = gettext("I2P failed to start");
+    $body    = gettext("Something went wrong when I2P was starting. Look in the following file for more information:") . "\n\t/tmp/wrapper.log" . "\n\t/var/lib/i2p/.i2p/logs/log-router-*.txt";
+
+    $notification = $notify->create(summary => $summary,
+                                    body => $body,
+                                    timeout => 60000);
+    $notification->show();
+    exit 1;
+}

config/chroot_local-includes/usr/share/applications/i2p.desktop

 [Desktop Entry]
 Categories=Network;
 Comment=Anonymous overlay network 
-Exec=sudo /etc/init.d/i2p restart; sleep 30; iceweasel http://127.0.0.1:7657/
+Exec=/usr/local/bin/tails-start-i2p
 Icon=/usr/lib/i2p/eepsite/docroot/favicon.ico
 Name=i2p
 GenericName=Anonymous overlay network

debian/changelog

+tails (0.6) unstable; urgency=low
+
+  ** SNAPSHOT build @6360b80d9a2df78b7b22f90c105dabbafce5ab1c **
+
+  * Releasing 0.6.
+
+  * New OpenPGP signing-only key. Details are on the website:
+    https://amnesia.boum.org/GnuPG_key/
+
+  * Iceweasel
+  - Fixed torbutton has migrated to testing, remove custom package.
+
+  * HTP
+  - Query ssl.scroogle.org instead of lists.debian.org.
+  - Don't run when the interface that has gone up is the loopback one.
+
+  * Nautilus scripts
+  - Add shortcut to securely erase free space in a partition.
+  - The nautilus-wipe shortcut user interface is now translatable.
+
+  * Misc
+  - Really fix virtualization warning display.
+  - More accurate APT pinning.
+  - Disable Debian sid APT source again since a fixed live-config has
+    migrated to Squeeze since then.
+
+  * live-boot: upgrade to 2.0.8-1+tails1.13926a
+  - Sometimes fixes the smem at shutdown bug.
+  - Now possible to create a second partition on the USB stick T(A)ILS is
+    running from.
+
+  * Hardware support
+  - Support RT2860 wireless chipsets by installing firmware-ralink from
+    Debian Backports.
+  - Install firmware-linux-nonfree from backports.
+  - Fix b43 wireless chipsets by having b43-fwcutter extract firmwares at
+    build time.
+
+  * Build system
+  - Install live-build and live-helper from Squeeze.
+  - Update SquashFS sort file.
+
+ -- T(A)ILS developers <amnesia@boum.org>  Wed, 20 Oct 2010 19:53:17 +0200
+
 tails (0.6~rc3) UNRELEASED; urgency=low
 
   ** SNAPSHOT build @a3ebb6c775d83d1a1448bc917a9f0995df93e44d **

debian/control

@@ -11,7 +11,7 @@ Vcs-Git: git://git.immerda.ch/amnesia.git
 
 Package: tails
 Architecture: all
-Depends: ${misc:Depends}, live-build (>= 2.0.1),
+Depends: ${misc:Depends}, live-build (>= 2.0.3),
  syslinux (>= 2:4.01+dfsg-1), dpkg-dev, ikiwiki, po4a, gettext
 Description: a Tor-ified, amnesic Live System
  The (Amnesic) Incognito Live System is aimed at preserving its users' privacy:

release

@@ -36,8 +36,6 @@ fatal () {
 
 [ -n "${NEW_VERSION}" ] \
    || fatal "the new version must be supplied on the command-line."
-[ "${SNAPSHOT}" = yes -o -n "${SINCE}" ] \
-   || fatal "the second argument must be either 'dev' or the commitish we'll start reading commit messages at."
 [ -n "${AMNESIA_DEV_FULLNAME}" ] \
    || fatal "AMNESIA_DEV_FULLNAME must be set in config/amnesia"
 [ -n "${AMNESIA_DEV_EMAIL}" ] \
@@ -58,7 +56,8 @@ export DEBEMAIL="${AMNESIA_DEV_EMAIL}"
 echo "Updating debian/changelog from Git history..."
 git-dch \
    `if [ ${SNAPSHOT} = yes ]; then echo '--snapshot --auto' ; fi` \
-   `if [ ${SNAPSHOT} = no ]; then echo "--release --since=${SINCE}" ; fi` \
+   `if [ ${SNAPSHOT} = no -a -n ${SINCE} ]; then echo "--release --since=${SINCE}" ; fi` \
+   `if [ ${SNAPSHOT} = no -a -z ${SINCE} ]; then echo "--release --auto" ; fi` \
    --new-version="${NEW_VERSION}" \
    --ignore-branch \
    || fatal "git-dch failed."

wiki/src/build.mdwn

@@ -16,10 +16,9 @@ For the impatient ones:
 Dependencies
 ============
 
-* `live-build` 2.0.1; T(A)ILS code is usually tested against Squeeze's
-  live-build, but a sid or Debian Live snapshot package can sometimes
-  be needed during a development cycle:  see the [Debian Live
-  manual](http://live.debian.net/manual/html/) for details.
+* `live-build` 2.0.3; T(A)ILS code is usually tested against Squeeze's
+  live-build, but a sid or a snapshot from the Debian Live repository
+  can sometimes be needed during a development cycle.
 * `syslinux` >= 4.01, so that the built ISO images are
   converted to hybrid ones: they can be either a CD-ROM or a hard disk
   (USB disk, etc.).

wiki/src/contribute/release_process.mdwn

@@ -29,6 +29,7 @@ Now cleanup some parts of it (semi-)automatically:
 	perl -pi'' -e 's/\A  \[ 127\.0\.0\.1 \]\n//' debian/changelog
 	perl -pi'' -e 's/\A  \[ amnesia \]\n//' debian/changelog
 	perl -pi'' -e 's/\A  \[ anonym \]\n//' debian/changelog
+	perl -pi'' -e 's/\A  \[ T\(A\)ILS developers \]\n//' debian/changelog
 	perl -pi'' -e 's/\A  \* Added a comment\n//' debian/changelog
 	perl -pi'' -e 's/\A  \* Added a comment:.*\n//' debian/changelog
 	perl -pi'' -e 's/\A  \* todo\+\+\n//i' debian/changelog

wiki/src/contribute/roadmap.mdwn

 [[!meta title="Roadmap"]]
 
 1. [[todo/include_truecrypt]]
-2. [[todo/persistence]]: application specific configurations persistence
+2. [[todo/persistence]]: application specific configurations
+   persistence, user data store
 3. [[todo/usb_install_and_upgrade]]
 4. Various other, unordered goals:
   * [[todo/monkeysphere]]

wiki/src/download.ca.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-09-27 21:56-0600\n"
+"POT-Creation-Date: 2010-10-15 01:34-0600\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"
@@ -76,6 +76,10 @@ msgstr ""
 msgid "Direct download (HTTP)"
 msgstr ""
 
+#. type: Content of: <div><div><div><h3>
+msgid "Latest release"
+msgstr ""
+
 #. type: Content of: <div><div><div><p>
 msgid "Here it is:"
 msgstr ""
@@ -93,6 +97,23 @@ msgid ""
 "address if you can."
 msgstr ""
 
+#. type: Content of: <div><div><div><h3>
+msgid "Release candidates"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"<strong>Warning!</strong> Please try release candidates for testing purposes "
+"but do <strong>not</strong> rely on these for anything. No guarantee, "
+"blablabla. Anyway, here they are:"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"<a href='http://dl.amnesia.boum.org/tails/testing/'> http://dl.amnesia.boum."
+"org/tails/testing/ </a>"
+msgstr ""
+
 #. type: Content of: <div><div><h1>
 msgid "2. Verify the downloaded image integrity"
 msgstr ""

wiki/src/download.de.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-09-27 21:56-0600\n"
+"POT-Creation-Date: 2010-10-15 01:34-0600\n"
 "PO-Revision-Date: 2010-08-23 09:13+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -76,6 +76,10 @@ msgstr ""
 msgid "Direct download (HTTP)"
 msgstr ""
 
+#. type: Content of: <div><div><div><h3>
+msgid "Latest release"
+msgstr ""
+
 #. type: Content of: <div><div><div><p>
 msgid "Here it is:"
 msgstr ""
@@ -93,6 +97,23 @@ msgid ""
 "address if you can."
 msgstr ""
 
+#. type: Content of: <div><div><div><h3>
+msgid "Release candidates"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"<strong>Warning!</strong> Please try release candidates for testing purposes "
+"but do <strong>not</strong> rely on these for anything. No guarantee, "
+"blablabla. Anyway, here they are:"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"<a href='http://dl.amnesia.boum.org/tails/testing/'> http://dl.amnesia.boum."
+"org/tails/testing/ </a>"
+msgstr ""
+
 #. type: Content of: <div><div><h1>
 msgid "2. Verify the downloaded image integrity"
 msgstr ""

wiki/src/download.es.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-09-27 21:56-0600\n"
+"POT-Creation-Date: 2010-10-15 01:34-0600\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"
@@ -76,6 +76,10 @@ msgstr ""
 msgid "Direct download (HTTP)"
 msgstr ""
 
+#. type: Content of: <div><div><div><h3>
+msgid "Latest release"
+msgstr ""
+
 #. type: Content of: <div><div><div><p>
 msgid "Here it is:"
 msgstr ""
@@ -93,6 +97,23 @@ msgid ""
 "address if you can."
 msgstr ""
 
+#. type: Content of: <div><div><div><h3>
+msgid "Release candidates"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"<strong>Warning!</strong> Please try release candidates for testing purposes "
+"but do <strong>not</strong> rely on these for anything. No guarantee, "
+"blablabla. Anyway, here they are:"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"<a href='http://dl.amnesia.boum.org/tails/testing/'> http://dl.amnesia.boum."
+"org/tails/testing/ </a>"
+msgstr ""
+
 #. type: Content of: <div><div><h1>
 msgid "2. Verify the downloaded image integrity"
 msgstr ""

wiki/src/download.fr.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-09-27 21:56-0600\n"
+"POT-Creation-Date: 2010-10-15 01:34-0600\n"
 "PO-Revision-Date: 2010-09-25 17:58+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -78,6 +78,10 @@ msgstr ""
 msgid "Direct download (HTTP)"
 msgstr "Téléchargement direct (HTTP)"
 
+#. type: Content of: <div><div><div><h3>
+msgid "Latest release"
+msgstr ""
+
 #. type: Content of: <div><div><div><p>
 msgid "Here it is:"
 msgstr ""
@@ -95,6 +99,23 @@ msgid ""
 "address if you can."
 msgstr ""
 
+#. type: Content of: <div><div><div><h3>
+msgid "Release candidates"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"<strong>Warning!</strong> Please try release candidates for testing purposes "
+"but do <strong>not</strong> rely on these for anything. No guarantee, "
+"blablabla. Anyway, here they are:"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"<a href='http://dl.amnesia.boum.org/tails/testing/'> http://dl.amnesia.boum."
+"org/tails/testing/ </a>"
+msgstr ""
+
 #. type: Content of: <div><div><h1>
 msgid "2. Verify the downloaded image integrity"
 msgstr "2. Vérifier l'intégrité de l'image"

wiki/src/download.html

@@ -56,6 +56,8 @@ You can also have a look to the <a href='/torrents/files/'>full list</a>.
 
 	<h2>Direct download (HTTP)</h2>
 
+	<h3>Latest release</h3>
+
 	<p>
 	Here it is:
 	</p>
@@ -72,6 +74,21 @@ You can also have a look to the <a href='/torrents/files/'>full list</a>.
 	faulty mirror's IP address if you can.
 	</p>
 
+	<h3>Release candidates</h3>
+
+	<p>
+	  <strong>Warning!</strong> Please try release candidates for
+	  testing purposes but do <strong>not</strong> rely on these
+	  for anything. No guarantee, blablabla. Anyway, here they
+	  are:
+	</p>
+
+	<p>
+		<a href='http://dl.amnesia.boum.org/tails/testing/'>
+			http://dl.amnesia.boum.org/tails/testing/
+		</a>
+	</p>
+
 </div> <!-- #http -->
 
 </div> <!-- #download_the_image .container -->

wiki/src/git.ca.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-12 09:50-0600\n"
+"POT-Creation-Date: 2010-10-15 01:16-0600\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"
@@ -124,7 +124,7 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "Please note that the `testing` branch generally has not been granted the "
-"same testing and attention as code that has made it into a `stable` release: "
+"same testing and attention as code that has made it into a stable release: "
 "please use it for testing purposes but do not rely on it for anything. No "
 "guarantee, blablabla."
 msgstr ""
@@ -151,6 +151,25 @@ msgstr ""
 msgid "The `master` branch is merged into `devel` from time to time."
 msgstr ""
 
+#. type: Title ###
+#, no-wrap
+msgid "squeeze"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The `squeeze` branch is aimed at building test images based on Debian "
+"Squeeze whereas all other branches are based on Debian Lenny for the time "
+"being. Code from the `devel` branch is merged into the `squeeze` one from "
+"time to time."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Please note that the `squeeze` branch can be broken, have awful security "
+"problems and so on. No guarantee, blablabla."
+msgstr ""
+
 #. type: Title =
 #, no-wrap
 msgid "live-boot\n"

wiki/src/git.de.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-12 09:50-0600\n"
+"POT-Creation-Date: 2010-10-15 01:16-0600\n"
 "PO-Revision-Date: 2010-06-08 11:50+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -132,7 +132,7 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "Please note that the `testing` branch generally has not been granted the "
-"same testing and attention as code that has made it into a `stable` release: "
+"same testing and attention as code that has made it into a stable release: "
 "please use it for testing purposes but do not rely on it for anything. No "
 "guarantee, blablabla."
 msgstr ""
@@ -159,6 +159,25 @@ msgstr ""
 msgid "The `master` branch is merged into `devel` from time to time."
 msgstr ""
 
+#. type: Title ###
+#, no-wrap
+msgid "squeeze"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The `squeeze` branch is aimed at building test images based on Debian "
+"Squeeze whereas all other branches are based on Debian Lenny for the time "
+"being. Code from the `devel` branch is merged into the `squeeze` one from "
+"time to time."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Please note that the `squeeze` branch can be broken, have awful security "
+"problems and so on. No guarantee, blablabla."
+msgstr ""
+
 #. type: Title =
 #, no-wrap
 msgid "live-boot\n"

wiki/src/git.es.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-12 09:50-0600\n"
+"POT-Creation-Date: 2010-10-15 01:16-0600\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"
@@ -124,7 +124,7 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "Please note that the `testing` branch generally has not been granted the "
-"same testing and attention as code that has made it into a `stable` release: "
+"same testing and attention as code that has made it into a stable release: "
 "please use it for testing purposes but do not rely on it for anything. No "
 "guarantee, blablabla."
 msgstr ""
@@ -151,6 +151,25 @@ msgstr ""
 msgid "The `master` branch is merged into `devel` from time to time."
 msgstr ""
 
+#. type: Title ###
+#, no-wrap
+msgid "squeeze"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The `squeeze` branch is aimed at building test images based on Debian "
+"Squeeze whereas all other branches are based on Debian Lenny for the time "
+"being. Code from the `devel` branch is merged into the `squeeze` one from "
+"time to time."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Please note that the `squeeze` branch can be broken, have awful security "
+"problems and so on. No guarantee, blablabla."
+msgstr ""
+
 #. type: Title =
 #, no-wrap
 msgid "live-boot\n"

wiki/src/git.fr.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-12 09:50-0600\n"
+"POT-Creation-Date: 2010-10-15 01:16-0600\n"
 "PO-Revision-Date: 2010-06-08 11:52+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -135,7 +135,7 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "Please note that the `testing` branch generally has not been granted the "
-"same testing and attention as code that has made it into a `stable` release: "
+"same testing and attention as code that has made it into a stable release: "
 "please use it for testing purposes but do not rely on it for anything. No "
 "guarantee, blablabla."
 msgstr ""
@@ -162,6 +162,25 @@ msgstr ""
 msgid "The `master` branch is merged into `devel` from time to time."
 msgstr ""
 
+#. type: Title ###
+#, no-wrap
+msgid "squeeze"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The `squeeze` branch is aimed at building test images based on Debian "
+"Squeeze whereas all other branches are based on Debian Lenny for the time "
+"being. Code from the `devel` branch is merged into the `squeeze` one from "
+"time to time."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Please note that the `squeeze` branch can be broken, have awful security "
+"problems and so on. No guarantee, blablabla."
+msgstr ""
+
 #. type: Title =
 #, no-wrap
 msgid "live-boot\n"

wiki/src/git.mdwn

@@ -53,7 +53,7 @@ new stuff in the `devel` branch.
 
 Please note that the `testing` branch generally has not been granted
 the same testing and attention as code that has made it into a
-`stable` release: please use it for testing purposes but do not rely
+stable release: please use it for testing purposes but do not rely
 on it for anything. No guarantee, blablabla.
 
 ### devel
@@ -67,6 +67,16 @@ problems and so on. No guarantee, blablabla.
 
 The `master` branch is merged into `devel` from time to time.