Commit 28b28bd1 authored by Tails developers's avatar Tails developers
Browse files

Merge remote branch 'origin/bugfix/only-one-memlockd' into devel

Conflicts:
	wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
parents 32d4360c 1b23453f
#! /bin/sh
### BEGIN INIT INFO
# Provides: tails-reconfigure-memlockd
# Required-Start: $local_fs memlockd
# Required-Start: $local_fs
# Required-Stop:
# Default-Start: 2 3 4 5
# Default-Stop:
# X-Start-Before: memlockd
# Short-Description: Reconfigure memlockd depending on running kernel
# Description: Reconfigure memlockd depending on running kernel
### END INIT INFO
......@@ -18,7 +19,6 @@ case "$1" in
>> "$MEMLOCKD_CONF"
tails-boot-to-kexec initrd $(tails-get-bootinfo initrd) \
>> "$MEMLOCKD_CONF"
service memlockd restart
# Tell sendsigs to forget about memlockd. Together with
# not calling 'memlockd stop' on shutdown, we have a
......
#! /bin/sh
### BEGIN INIT INFO
# Provides: tails-sdmem-on-media-removal
# Required-Start: udev $local_fs tails-reconfigure-memlockd tails-reconfigure-kexec
# Required-Start: udev $local_fs memlockd tails-reconfigure-memlockd tails-reconfigure-kexec
# Required-Stop: $local_fs memlockd
# Default-Start: 2 3 4 5
# Default-Stop: 0 6
......
......@@ -7,10 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2012-12-13 11:49+0100\n"
"PO-Revision-Date: 2012-11-20 21:21-0000\n"
"PO-Revision-Date: 2012-12-18 13:44-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"
......@@ -48,7 +47,7 @@ msgid ""
"[[!img tails-desktop-0.10.jpg link=no alt=\"Tails desktop as of 0.9\" title=\"Tails\n"
"Desktop as of 0.10\"]]\n"
msgstr ""
"[[!img tails-desktop-0.10.jpg link=no alt=\"Bureau de Tails version 0.9\" title=\"Tails\n"
"[[!img tails-desktop-0.10.jpg link=no alt=\"Tails desktop as of 0.9\" title=\"Tails\n"
"Desktop as of 0.10\"]]\n"
#. type: Title =
......@@ -83,7 +82,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!img applications-menu.jpg link=no alt=\"Applications menu\"]]\n"
msgstr "[[!img applications-menu.jpg link=no alt=\"Menu des applications\"]]\n"
msgstr "[[!img applications-menu.jpg link=no alt=\"Applications menu\"]]\n"
#. type: Title -
#, no-wrap
......@@ -99,7 +98,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!img places-menu.jpg link=no alt=\"Places menu\"]]\n"
msgstr "[[!img places-menu.jpg link=no alt=\"Menu des raccourcis\"]]\n"
msgstr "[[!img places-menu.jpg link=no alt=\"Places menu\"]]\n"
#. type: Title -
#, no-wrap
......@@ -115,7 +114,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!img system-menu.jpg link=no alt=\"System menu\"]]\n"
msgstr "[[!img system-menu.jpg link=no alt=\"Menu système\"]]\n"
msgstr "[[!img system-menu.jpg link=no alt=\"System menu\"]]\n"
#. type: Plain text
msgid "Here are a few ones that you might want to check:"
......@@ -447,7 +446,7 @@ msgid "[[!img system-shutdown.png link=no]]\n"
msgstr "[[!img system-shutdown.png link=no]]\n"
#. type: Plain text
#, fuzzy, no-wrap
#, no-wrap
#| msgid ""
#| "<div class=\"text\"><strong>System Shutdown</strong>: immediately shut down the\n"
#| "system</div>\n"
......@@ -457,7 +456,8 @@ msgid ""
"system</div>\n"
"</div>\n"
msgstr ""
"<div class=\"text\"><strong>System Shutdown</strong> :Arrête immédiatement le système</div>\n"
"<div class=\"text\"><strong>System Shutdown</strong> : Arrête ou redémarre le\n"
"système</div>\n"
"</div>\n"
#. type: Title =
......
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