Commit b5c9e08d authored by intrigeri's avatar intrigeri
Browse files

Merge branch 'stable' into devel

parents e258acf8 1b283cd6
......@@ -67,7 +67,7 @@ Pin-Priority: 990
Package: *
Pin: release o=TorProject,n=stretch
Pin-Priority: 990
Pin-Priority: 989
Package: *
Pin: origin live.debian.net
......
......@@ -7,7 +7,6 @@ tmp/*
usr/share/amnesia/packages/*
usr/share/doc/tails/website/blueprint/*
usr/share/doc/tails/website/contribute/how/translate/translation_progress.html
usr/share/doc/tails/website/forum/*
usr/share/doc/tails/website/promote/slides/*
usr/share/doc/tails/website/torrents/rss.html
usr/share/icons/*/.icon-theme.cache
......
-*- mode: markdown; -*-
Hercules eCAFÉ™ EC-800
======================
Linux kernel
------------
`lb config --linux-flavours 486`
X.Org
-----
### Custom configuration file
- copy, and optionally adapt, the custom `./examples/eCAFE/xorg.conf`
to `config/chroot_local-includes/etc/X11/` ; beware of the
permissions, non-root users must have read access to the including
X11 directory and to the `xorg.conf` file
### Disable automatic X.Org configuration
In `config/amnesia`, add `noxautoconfig` to the `AMNESIA_APPEND`
boot parameters list.
### Weird bugfix
Probably due to a bug in `live-helper` or `live-initramfs`, one also has
to create in the chroot:
- the `/etc/X11` directory
- the `/etc/X11/X` symbolic link.
This can be easily achieved by copying `./examples/eCAFE/X11_fixup` to
`config/chroot_local-hooks`. The copied file must have executable
permissions set.
Console frame buffer
--------------------
In `config/amnesia`, edit the `AMNESIA_APPEND` boot parameters list
to:
- remove `vga=791`
- add `video=lxfb:800x480@60`
#!/bin/sh
if [ ! -d /etc/X11 ]; then
mkdir /etc/X11
chmod 755 /etc/X11
fi
ln -s --force /usr/bin/Xorg /etc/X11/X
# xorg.conf (X.Org X Window System server configuration file)
Section "InputDevice"
Identifier "Generic Keyboard"
Driver "kbd"
Option "XkbRules" "xorg"
Option "XkbModel" "pc105"
Option "XkbLayout" "fr"
EndSection
Section "InputDevice"
Identifier "Configured Mouse"
Driver "mouse"
EndSection
Section "Device"
Identifier "Configured Video Device"
Driver "geode"
BusID "PCI:0:1:1"
Option "UseFBDev" "true"
Option "PanelGeometry" "800x480"
EndSection
Section "Monitor"
Identifier "Configured Monitor"
Option "DPMS"
HorizSync 25 - 50
VertRefresh 50.0 - 75.0
Modeline "800x480" 33.45 800 840 968 1056 480 490 492 525 -hsync -vsync
Modeline "1024x600" 48.96 1024 1064 1168 1312 600 601 604 622 -hsync +vsync
Modeline "1024x768" 64.56 1024 1056 1296 1328 768 783 791 807 -hsync +vsync
DisplaySize 255 150
EndSection
Section "Screen"
Identifier "Default Screen"
Monitor "Configured Monitor"
Device "Configured Video Device"
DefaultDepth 16
SubSection "Display"
Depth 16
Modes "800x480"
Viewport 0 0
EndSubSection
#Virtual 1024 768
EndSection
......@@ -8,7 +8,42 @@ tails (3.1) UNRELEASED; urgency=medium
* Dummy entry for next release.
-- Tails developers <tails@boum.org> Tue, 13 Jun 2017 05:55:30 +0000
-- Tails developers <tails@boum.org> Mon, 12 Jun 2017 18:39:31 +0000
tails (3.0.1) unstable; urgency=medium
* Security fixes
- Upgrade tor to 0.3.0.9-1~d90.stretch+1 (Closes: #13253).
- Upgrade Linux to 4.9.30-2+deb9u2.
- Upgrade libc to 2.24-11+deb9u1.
- Upgrade libexpat1 to 2.2.0-2+deb9u1.
- Upgrade libgcrypt20 to 1.7.6-2+deb9u1.
- Upgrade libgnutls30 to 3.5.8-5+deb9u1.
* Minor improvements
- Use a higher resolution image in Tails persistence setup
(Closes: #12510).
* Bugfixes
- Forcibly set $SSH_eAUTH_SOCK before starting GNOME
Shell. Apparently, due to a race condition, GNOME keyring
sometimes fails to tell the session manager about the correct
SSH_AUTH_SOCK, and thus GNOME Terminal hasn't this variable set
and any ssh process started in there won't use the (perfectly
working) SSH agent (Closes: #12481).
- Fix issue that made Tails Installer rejects working USB drives,
pretending they're not "removable" (Closes: #12696).
- Make power button and lid close actions in the Greeter
consistent with the regular GNOME session (Closes: #13000).
* Build system
- Track the latest debian-security archive for the corresponding
APT sources, and not for the unrelated jessie-updates (Closes:
#12829).
- Print APT sources used in the build VM, to help debugging issues
such as #12829.
-- Tails developers <tails@boum.org> Tue, 04 Jul 2017 15:59:18 +0200
tails (3.0) unstable; urgency=medium
......
......@@ -236,7 +236,7 @@ po_slave_languages:
#
# When updating this list, refer to the checklist in
# https://tails.boum.org/contribute/how/website/po_translatable_pages/
po_translatable_pages: '!security/audits and !security/audits/* and !news/report_2* and !news/version_0* and !news/version_1* and !news/test_0* and !news/test_1* and !news/test_*alpha? and !news/test_*-beta? and !news/test_*-rc? and !security/Numerous_security_holes_in_0* and !security/Numerous_security_holes_in_1* and (about or about/* or bugs or chat or contribute or contribute/how/donate or doc or doc/* or donate or donate/* or download or download.inline or getting_started or home or inc/stable_amd64_release_notes or index or news or news/* or press or security or security/* or sidebar or support or support/* or torrents or misc or misc/* or install or install/* or upgrade or upgrade/*)'
po_translatable_pages: '!security/audits and !security/audits/* and !news/report_2* and !news/version_0* and !news/version_1* and !news/test_0* and !news/test_1* and !news/test_*alpha? and !news/test_*-beta? and !news/test_*-rc? and !security/Numerous_security_holes_in_0* and !security/Numerous_security_holes_in_1* and (about or about/* or bugs or chat or contribute or doc or doc/* or donate or donate/* or download or download.inline or getting_started or home or inc/stable_amd64_release_notes or index or news or news/* or press or security or security/* or sidebar or support or support/* or torrents or misc or misc/* or install or install/* or upgrade or upgrade/*)'
# internal linking behavior (default/current/negotiated)
po_link_to: current
......
......@@ -213,7 +213,7 @@ po_slave_languages:
#
# When updating this list, refer to the checklist in
# https://tails.boum.org/contribute/how/website/po_translatable_pages/
po_translatable_pages: '!security/audits and !security/audits/* and !news/report_2* and !news/version_0* and !news/version_1* and !news/test_0* and !news/test_1* and !news/test_*alpha? and !news/test_*-beta? and !news/test_*-rc? and !security/Numerous_security_holes_in_0* and !security/Numerous_security_holes_in_1* and (about or about/* or bugs or chat or contribute or contribute/how/donate or doc or doc/* or donate or donate/* or download or download.inline or getting_started or home or inc/stable_amd64_release_notes or index or news or news/* or press or security or security/* or sidebar or support or support/* or torrents or misc or misc/* or install or install/* or upgrade or upgrade/*)'
po_translatable_pages: '!security/audits and !security/audits/* and !news/report_2* and !news/version_0* and !news/version_1* and !news/test_0* and !news/test_1* and !news/test_*alpha? and !news/test_*-beta? and !news/test_*-rc? and !security/Numerous_security_holes_in_0* and !security/Numerous_security_holes_in_1* and (about or about/* or bugs or chat or contribute or doc or doc/* or donate or donate/* or download or download.inline or getting_started or home or inc/stable_amd64_release_notes or index or news or news/* or press or security or security/* or sidebar or support or support/* or torrents or misc or misc/* or install or install/* or upgrade or upgrade/*)'
# internal linking behavior (default/current/negotiated)
po_link_to: current
......
......@@ -21,8 +21,8 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-05 11:57+0200\n"
"PO-Revision-Date: 2017-05-26 14:47+0000\n"
"Last-Translator: carolyn <carolyn@anhalt.org>\n"
"PO-Revision-Date: 2017-06-20 10:27+0000\n"
"Last-Translator: scootergrisen\n"
"Language-Team: Danish (http://www.transifex.com/otf/torproject/language/"
"da/)\n"
"Language: da\n"
......@@ -37,7 +37,7 @@ msgstr "Tor er klar"
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40
msgid "You can now access the Internet."
msgstr "Du kan nu forbinde til internettet."
msgstr "Du har nu adgang til internettet."
#: config/chroot_local-includes/etc/whisperback/config.py:65
#, python-format
......@@ -121,7 +121,7 @@ msgstr "Om Tails"
#: config/chroot_local-includes/usr/local/bin/tails-about:35
msgid "The Amnesic Incognito Live System"
msgstr "Det Hukommelsestabende Inkognito Live System"
msgstr "The Amnesic Incognito Live System"
#: config/chroot_local-includes/usr/local/bin/tails-about:36
#, python-format
......@@ -129,7 +129,7 @@ msgid ""
"Build information:\n"
"%s"
msgstr ""
"Information om denne udgave:\n"
"Byggeinformation:\n"
"%s"
#: config/chroot_local-includes/usr/local/bin/tails-about:54
......@@ -166,8 +166,8 @@ msgid ""
"Tor needs an accurate clock to work properly, especially for Hidden "
"Services. Please wait..."
msgstr ""
"Tor behøver et akkurat ur for at fungere korrekt, specielt for skjulte "
"servicer. Vent venligst..."
"Tor har brug for et præcist ur for at fungere ordentligt, specielt for "
"skjulte tjenester. Vent venligst..."
#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:87
msgid "Failed to synchronize the clock!"
......@@ -234,32 +234,32 @@ msgid ""
"Or do a manual upgrade.\n"
"See https://tails.boum.org/doc/first_steps/upgrade#manual"
msgstr ""
"<b>Der er ikke nok hukommelse tilgængelig til at søge efter opdateringer.</"
"<b>Der er ikke nok hukommelse tilgængelig til at søge efter opgraderinger.</"
"b>\n"
"\n"
"Sørg for at dette system opfylder kravene til at køre Tails. \n"
"Se file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n"
"\n"
"Prøv at genstarte Tails for at søge efter opdateringer igen.\n"
"Prøv at genstarte Tails for at søge efter opgraderinger igen.\n"
"\n"
"Eller foretag en manuel opgradering.\n"
"Se https://tails.boum.org/doc/first_steps/upgrade#manual"
#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:71
msgid "Warning: virtual machine detected!"
msgstr "Advarsel: virtuel maskine opdaget!"
msgstr "Advarsel: virtuel maskine registreret!"
#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:73
msgid ""
"Both the host operating system and the virtualization software are able to "
"monitor what you are doing in Tails."
msgstr ""
"Både værtsoperativsystemet og virtualiseringssoftwaren har mulighed for at "
"Både værtsstyresystemet og virtualiseringssoftwaren har mulighed for at "
"overvåge hvad du foretager dig i Tails."
#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:76
msgid "Warning: non-free virtual machine detected!"
msgstr "Advarsel: ikke-fri virtuel maskine opdaget!"
msgstr "Advarsel: ikke-fri virtuel maskine registreret!"
#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:78
msgid ""
......@@ -268,10 +268,9 @@ msgid ""
"trustworthy, for both the host operating system and the virtualization "
"software."
msgstr ""
"Både værtsoperativsystemet og virtualiseringssoftwaren har mulighed for at "
"Både værtsstyresystemet og virtualiseringssoftwaren har mulighed for at "
"overvåge hvad du foretager dig i Tails. Kun fri software kan betragtes som "
"værende troværdigt, både for værtsoperativsystemet og "
"virtualiseringssoftwaren."
"værende troværdigt, både for værtsstyresystemet og virtualiseringssoftwaren."
#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:83
msgid "Learn more"
......
......@@ -29,7 +29,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-05 11:57+0200\n"
"PO-Revision-Date: 2017-05-26 14:47+0000\n"
"PO-Revision-Date: 2017-06-11 09:52+0000\n"
"Last-Translator: carolyn <carolyn@anhalt.org>\n"
"Language-Team: German (http://www.transifex.com/otf/torproject/language/"
"de/)\n"
......
......@@ -15,7 +15,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-05 11:57+0200\n"
"PO-Revision-Date: 2017-05-26 14:47+0000\n"
"PO-Revision-Date: 2017-06-10 17:16+0000\n"
"Last-Translator: carolyn <carolyn@anhalt.org>\n"
"Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/"
"es/)\n"
......
......@@ -16,7 +16,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-05 11:57+0200\n"
"PO-Revision-Date: 2017-05-26 14:47+0000\n"
"PO-Revision-Date: 2017-06-12 15:31+0000\n"
"Last-Translator: carolyn <carolyn@anhalt.org>\n"
"Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/"
"language/fr_CA/)\n"
......
......@@ -3,7 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# benewfy <benewfy@gmail.com>, 2015-2016
# benewfy <benewfy@gmail.com>, 2015-2017
# Falu <info@falu.me>, 2016-2017
# Blackywantscookies, 2014
# Blackywantscookies, 2014
......@@ -16,8 +16,8 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-05 11:57+0200\n"
"PO-Revision-Date: 2017-05-26 14:47+0000\n"
"Last-Translator: carolyn <carolyn@anhalt.org>\n"
"PO-Revision-Date: 2017-06-25 17:10+0000\n"
"Last-Translator: benewfy <benewfy@gmail.com>\n"
"Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/"
"hu/)\n"
"Language: hu\n"
......@@ -32,7 +32,7 @@ msgstr "A Tor készen áll."
#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40
msgid "You can now access the Internet."
msgstr "Most már hozzáféhetsz az internethez."
msgstr "Most már hozzáférhetsz az internethez."
#: config/chroot_local-includes/etc/whisperback/config.py:65
#, python-format
......
......@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-05 11:57+0200\n"
"PO-Revision-Date: 2017-05-26 14:47+0000\n"
"PO-Revision-Date: 2017-06-18 10:24+0000\n"
"Last-Translator: carolyn <carolyn@anhalt.org>\n"
"Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/"
"is/)\n"
......
......@@ -29,7 +29,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-05 11:57+0200\n"
"PO-Revision-Date: 2017-05-26 14:47+0000\n"
"PO-Revision-Date: 2017-06-28 16:35+0000\n"
"Last-Translator: carolyn <carolyn@anhalt.org>\n"
"Language-Team: Italian (http://www.transifex.com/otf/torproject/language/"
"it/)\n"
......
......@@ -18,8 +18,8 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-05 11:57+0200\n"
"PO-Revision-Date: 2017-05-26 14:47+0000\n"
"Last-Translator: carolyn <carolyn@anhalt.org>\n"
"PO-Revision-Date: 2017-06-11 18:22+0000\n"
"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
"Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/"
"language/nb/)\n"
"Language: nb\n"
......@@ -117,7 +117,7 @@ msgstr "Om Tails"
#: config/chroot_local-includes/usr/local/bin/tails-about:35
msgid "The Amnesic Incognito Live System"
msgstr "The Amnesic Incognito Live System"
msgstr "The (Det) Amnesiske Inkognito Levende System"
#: config/chroot_local-includes/usr/local/bin/tails-about:36
#, python-format
......@@ -145,7 +145,7 @@ msgid ""
"your network connection, try to restart Tails, or read the system log to "
"understand better the problem."
msgstr ""
"Oppdateringen feilet. Dette kan skyldes et nettverksproblem. Sjekk "
"Oppdateringen mislyktes. Dette kan skyldes et nettverksproblem. Sjekk "
"nettverksforbindelsen din, prøv å starte Tails på nytt, eller les "
"systemloggen for å forstå problemet bedre. "
......@@ -167,7 +167,7 @@ msgstr ""
#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:87
msgid "Failed to synchronize the clock!"
msgstr "Synkronisering av klokken feilet!"
msgstr "Synkronisering av klokken mislyktes!"
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
......@@ -357,7 +357,7 @@ msgstr ""
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:122
msgid "Failed to setup chroot."
msgstr "Feilet i å opprette et chroot-miljø."
msgstr "Mislyktes i å opprette et chroot-miljø."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:128
msgid "Failed to configure browser."
......
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