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

Merge branch 'master' of git://git.tails.boum.org/tails

Conflicts:
	wiki/src/support/talk.fr.po
parents 2319aa02 77061c5f
......@@ -5,6 +5,12 @@ Some hardware ([[bugs/ThinkPad_X220_vs_GPT]], recent Mac) cannot boot
Tails from USB, due to firmware limitations. Making Tails support UEFI
would fix this problem on such hardware.
* lernstick Grub configuration, implemented as a live-build binary
hook, that's meant to be nice with an existing syslinux
configuration managed by live-build:
<https://github.com/imedias/lernstickAdvanced.git> (oh, and they use
the [xmlboot](https://github.com/imedias/xmlboot) gfxboot script and
many crazy Grub configuration scripts)
* Mike Hommey's
[Debian EFI mode boot on a Macbook Pro, without rEFIt](http://glandium.org/blog/?p=2830)
* Steve McIntyre's EFI installation progress:
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2013-08-11 18:34+0300\n"
"POT-Creation-Date: 2013-08-12 12:01+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"
......@@ -32,6 +32,13 @@ msgstr ""
msgid "Subscribe to our [[user support mailing list|tails-support]]."
msgstr ""
#. type: Content of: <div><p>
msgid ""
"This is a public mailing list, so <strong>be careful with what you are "
"sending</strong>, and what it can reveal about yourself: location, IP "
"address, email subject and content, etc."
msgstr ""
#. type: Content of: <div><h3>
msgid "Chat"
msgstr ""
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2013-08-11 18:34+0300\n"
"POT-Creation-Date: 2013-08-12 12:01+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"
......@@ -32,6 +32,13 @@ msgstr "[[!img lib/forum.png link=no]]"
msgid "Subscribe to our [[user support mailing list|tails-support]]."
msgstr ""
#. type: Content of: <div><p>
msgid ""
"This is a public mailing list, so <strong>be careful with what you are "
"sending</strong>, and what it can reveal about yourself: location, IP "
"address, email subject and content, etc."
msgstr ""
#. type: Content of: <div><h3>
msgid "Chat"
msgstr "Chat"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tails-talk-users-fr\n"
"POT-Creation-Date: 2013-08-11 18:34+0300\n"
"PO-Revision-Date: 2013-08-12 10:59-0000\n"
"PO-Revision-Date: 2013-08-12 11:04-0000\n"
"Last-Translator: \n"
"Language-Team: nada-fr <LL@li.org>\n"
"MIME-Version: 1.0\n"
......@@ -32,6 +32,16 @@ msgid "Subscribe to our [[user support mailing list|tails-support]]."
msgstr ""
"S'abonner à notre [[liste mail d'assistance utilisateur|tails-support]]."
#. type: Content of: <div><p>
msgid ""
"This is a public mailing list, so <strong>be careful with what you are "
"sending</strong>, and what it can reveal about yourself: location, IP "
"address, email subject and content, etc."
msgstr ""
"Cette liste mail est publique, soyez donc <strong> prudents avec ce que vous "
"envoyez</strong>, et ce que ça pourrait révéler à votre propos : "
"emplacement, adresse IP, sujet du mail et contenu, etc."
#. type: Content of: <div><h3>
msgid "Chat"
msgstr "Chat"
......
......@@ -7,6 +7,10 @@
<p>Subscribe to our [[user support mailing list|tails-support]].</p>
<p>This is a public mailing list, so <strong>be careful with what you
are sending</strong>, and what it can reveal about yourself: location,
IP address, email subject and content, etc.</p>
</div>
<div id="talk-chat" class="three-blocks">
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2013-08-11 18:34+0300\n"
"POT-Creation-Date: 2013-08-12 12:01+0300\n"
"PO-Revision-Date: 2012-09-27 08:29-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -31,6 +31,13 @@ msgstr "[[!img lib/forum.png link=no]]"
msgid "Subscribe to our [[user support mailing list|tails-support]]."
msgstr ""
#. type: Content of: <div><p>
msgid ""
"This is a public mailing list, so <strong>be careful with what you are "
"sending</strong>, and what it can reveal about yourself: location, IP "
"address, email subject and content, etc."
msgstr ""
#. type: Content of: <div><h3>
msgid "Chat"
msgstr "Bate-papo"
......
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