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

Merge branch 'devel' into feature/torsocks

parents 6b503d09 a155a928
......@@ -2,6 +2,7 @@
*.mo~
*.po~
*.pot~
*.swp
/*.buildlog
/*.img
/*.iso
......
......@@ -13,7 +13,7 @@
# Base for the string that will be passed to "lb config --bootappend-live"
# FIXME: see [[bugs/sdmem_on_eject_broken_for_CD]] for explanation why we
# need to set block.events_dfl_poll_msecs
AMNESIA_APPEND="noswap live-media=removable nopersistent noprompt quiet timezone=Etc/UTC block.events_dfl_poll_msecs=1000 splash nox11autologin"
AMNESIA_APPEND="live-media=removable nopersistent noprompt quiet timezone=Etc/UTC block.events_dfl_poll_msecs=1000 splash nox11autologin"
### You should not have to change anything bellow this line ####################
......
......@@ -62,6 +62,10 @@ Package: live-config
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: live-config-sysvinit
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: macchanger
Pin: release o=Debian,a=unstable
Pin-Priority: 999
......@@ -303,6 +307,10 @@ Package: *
Pin: origin mozilla.debian.net
Pin-Priority: 991
Package: *
Pin: release o=Debian,n=squeeze-updates
Pin-Priority: 990
Package: *
Pin: release o=Debian,n=squeeze
Pin-Priority: 900
......
#!/bin/sh
# We don't want to swap to the local machine
rm -f /usr/share/initramfs-tools/scripts/live-bottom/13swap
......@@ -4,9 +4,9 @@
echo "removing unwanted iceweasel search plugins"
rm -f /usr/share/iceweasel/distribution/searchplugins/common/duckduckgo.xml
rm -f /usr/share/iceweasel/distribution/searchplugins/locale/*/amazon*.xml
rm -f /usr/share/iceweasel/distribution/searchplugins/locale/*/answers.xml
rm -f /usr/share/iceweasel/distribution/searchplugins/locale/*/bing*.xml
rm -f /usr/share/iceweasel/distribution/searchplugins/locale/*/eBay*.xml
rm -f /usr/share/iceweasel/distribution/searchplugins/locale/*/yahoo*.xml
rm -f /etc/iceweasel/searchplugins/common/duckduckgo.xml
rm -f /etc/iceweasel/searchplugins/locale/*/amazon*.xml
rm -f /etc/iceweasel/searchplugins/locale/*/answers.xml
rm -f /etc/iceweasel/searchplugins/locale/*/bing*.xml
rm -f /etc/iceweasel/searchplugins/locale/*/eBay*.xml
rm -f /etc/iceweasel/searchplugins/locale/*/yahoo*.xml
#!/bin/sh
/usr/bin/hardlink -t /usr/share/doc
apt-get --yes purge hardlink
LIVE_USER_DEFAULT_GROUPS="audio cdrom dialout floppy video plugdev netdev powerdev fuse debian-tor scanner lp lpadmin vboxsf"
amnesia ALL = NOPASSWD: /etc/init.d/i2p
amnesia ALL = NOPASSWD: /usr/local/bin/tails-start-i2p
......@@ -17,4 +17,4 @@ else
FILE="${PAGE}.html"
fi
exec iceweasel "file://${WIKI_ROOT}/${FILE}"
exec yelp "file://${WIKI_ROOT}/${FILE}"
......@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-12-30 11:18+0100\n"
"PO-Revision-Date: 2010-12-23 15:52+0100\n"
"PO-Revision-Date: 2012-04-13 14:22+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
......@@ -22,13 +22,12 @@ msgid "Synchronizing the system's clock"
msgstr "Mise à jour de l'horloge système..."
#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:56
#, fuzzy
msgid ""
"Tor needs an accurate clock to work properly, especially for Hidden "
"Services. Please wait..."
msgstr ""
"Tor a besoin d'une horloge bien réglée pour fonctionner correctement. "
"Veuillez patienter..."
"Tor a besoin d'une horloge bien réglée pour fonctionner correctement, en\n"
"particulier pour les services cachés. Veuillez patienter..."
#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:103
msgid "Failed to synchronize the clock!"
......
......@@ -52,7 +52,6 @@ libnotify-bin
audacity
barry-util
cups
cryptkeeper
cryptsetup
rsync
aircrack-ng
......@@ -92,6 +91,7 @@ gstreamer0.10-ffmpeg
gstreamer0.10-plugins-base
gstreamer0.10-plugins-good
gstreamer0.10-plugins-ugly
hardlink
haveged
# needed by laptop-mode-tools to spin-down hard drives
hdparm
......@@ -152,6 +152,7 @@ polipo
ppp
pwgen
resolvconf
rfkill
sane-utils
scribus-ng
seahorse
......@@ -252,6 +253,8 @@ ttf-thai-tlwg
brasero
### Accessibility
## mouse accessibility enhancements
mousetweaks
## screen magnifier
gnome-mag
## text-to-speech
......@@ -290,6 +293,9 @@ gnome-theme-xpluna
gnome-xp-icon-theme
xp-cursor-theme
### Needed by virtualbox-guest-utils
pciutils
### Spice and QXL
spice-vdagent
xserver-xorg-video-qxl
--- chroot.orig/etc/init.d/alsa-utils 2010-10-04 18:14:10.000000000 +0000
+++ chroot/etc/init.d/alsa-utils 2012-03-12 13:49:11.815997232 +0000
@@ -206,6 +206,9 @@
@@ -206,5 +206,10 @@
# On MacBookPro5,3 and later models (See Bug#597791)
unmute_and_set_level "Front Speaker" "80%"
+ # On MacBook5,2 models (See Bug#602973)
+ unmute_and_set_level "LFE" "80%"
+ # On Intel 82801H (See Bug#603550)
+ unmute_and_set_level "Speaker" "80%"
......
debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse debian-tor scanner lp lpadmin vboxsf
\ No newline at end of file
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