Commit 8b90c891 authored by Tails developers's avatar Tails developers
Browse files

Merge branch 'stable'

parents 9d497740 acaab604
......@@ -18,6 +18,7 @@
/config/common
/config/source
/config/binary_local-includes/doc/amnesia/wiki
/config/chroot_local-includes/etc/amnesia/environment
/config/chroot_local-includes/etc/amnesia/version
/config/chroot_local-includes/home/amnesia/.gnome2/nautilus-scripts
/config/chroot_local-includes/usr/share/amnesia/readahead-list
......
......@@ -19,6 +19,7 @@ if ls config/*/ > /dev/null 2>&1 ; then
fi
# files copied or created in the config stage
rm -f config/chroot_local-includes/etc/amnesia/environment
rm -f config/chroot_local-includes/etc/amnesia/version
rm -f config/chroot_local-includes/usr/share/doc/amnesia/Changelog
rm -f config/chroot_local-includes/usr/share/doc/amnesia/amnesia.asc
......
......@@ -15,7 +15,7 @@ $RUN_LB_CONFIG --distribution squeeze ${@}
# set Amnesia's general options
$RUN_LB_CONFIG \
--apt-recommends false \
--backports false \
--backports true \
--binary-images iso-hybrid \
--binary-indices false \
--isohybrid-options "$AMNESIA_ISOHYBRID_OPTS" \
......@@ -48,8 +48,15 @@ elif [ "$hw_arch" = powerpc -o "$hw_arch" = powerpc64 ]; then
${@}
fi
install -d config/chroot_local-includes/etc/amnesia/
# environment
TAILS_WIKI_SUPPORTED_LANGUAGES="$(ikiwiki-supported-languages ikiwiki.setup)"
[ -n "$TAILS_WIKI_SUPPORTED_LANGUAGES" ] || exit 16
echo "TAILS_WIKI_SUPPORTED_LANGUAGES='${TAILS_WIKI_SUPPORTED_LANGUAGES}'" \
>> config/chroot_local-includes/etc/amnesia/environment
# version
mkdir -p config/chroot_local-includes/etc/amnesia/
echo "${AMNESIA_FULL_VERSION}" > config/chroot_local-includes/etc/amnesia/version
if git rev-list HEAD 2>&1 >/dev/null; then
git rev-list HEAD | head -n 1 >> config/chroot_local-includes/etc/amnesia/version
......
#!/usr/bin/perl
=head1 NAME
ikiwiki-supported-languages - extract languages supported by a given ikwiki
=head1 SYNOPSIS
B<ikiwiki-supported-languages> YAML_IKIWIKI_SETUP_FILE
=head1 USAGE
The ikiwiki setup file passed as an argument must be in YAML format.
See http://ikiwiki.info/tips/yaml_setup_files/ if you want to convert yours.
The ikiwiki po plugin must be enabled and properly configured.
=head1 AUTHOR
Tails developers <amnesia@boum.org>
=head1 LICENSE AND COPYRIGHT
Copyright (C) 2011 Tails developers <amnesia@boum.org>
Licensed under the GNU GPL version 3 or any later version.
=cut
use strict;
use warnings;
use 5.10.1;
use IkiWiki::Plugin::po;
use YAML::Syck;
$YAML::Syck::ImplicitUnicode = 1;
sub usage {
"Usage: ikiwiki-supported-languages YAML_IKIWIKI_SETUP_FILE";
}
my $setupfile = shift;
defined $setupfile || die(usage());
$setupfile ne '' || die(usage());
-e $setupfile || die "File '$setupfile' does not exist.";
-f $setupfile || die "File '$setupfile' is not a regular file.";
my $config = LoadFile($setupfile);
ref($config) && ref($config) eq 'HASH'
|| die "Could not load '$setupfile'. Is it really YAML?";
for (qw{add_plugins po_master_language po_slave_languages}) {
exists($config->{$_}) && defined($config->{$_})
|| die "$_ is not set";
}
grep { $_ eq 'po' } $config->{add_plugins}
|| die "The po plugin is disabled.";
ref($config->{po_slave_languages}) && ref($config->{po_slave_languages}) eq 'ARRAY'
|| die "Invalid po_slave_languages format.";
my @supported_lang_codes;
for ($config->{po_master_language}, @{$config->{po_slave_languages}}) {
my ($code, $name) = IkiWiki::Plugin::po::splitlangpair($_);
defined $code && $code ne '' || die "invalid language format: '$_'";
push @supported_lang_codes, $code;
}
say join(' ', @supported_lang_codes);
......@@ -11,7 +11,7 @@
# sourced by various other scripts.
# Base for the string that will be passed to "lb config --bootappend-live"
AMNESIA_APPEND="splash vga=788 live-media=removable nopersistent noprompt"
AMNESIA_APPEND="noswap live-media=removable nopersistent noprompt quiet"
# Options passed to isohybrid
# Default: "-entry 4 -type 1c"
......
......@@ -95,7 +95,7 @@ for LANG_CODE in ${AMNESIA_SUPPORTED_LANGUAGES}; do
;;
zh)
LANG_NAME='^Chinese'
LANG_APPEND='locales=zh_CN.UTF-8 keyboard-layouts=zh timezone=Asia/Shangai'
LANG_APPEND='locales=zh_CN.UTF-8 timezone=Asia/Shanghai'
;;
*)
Echo_error "Language ${LANG_CODE} is not supported yet, ask amnesia developpers!"
......
This diff is collapsed.
......@@ -2,6 +2,38 @@ Package: aircrack-ng
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: eatmydata
Pin: origin backports.debian.org
Pin-Priority: 999
Package: firmware-linux-free
Pin: release o=Debian,a=proposed-updates
Pin-Priority: 999
Package: linux-base
Pin: release o=Debian,a=proposed-updates
Pin-Priority: 999
Package: linux-headers-2.6.32-5-common
Pin: release o=Debian,a=proposed-updates
Pin-Priority: 999
Package: linux-headers-2.6.32-5-686
Pin: release o=Debian,a=proposed-updates
Pin-Priority: 999
Package: linux-image-2.6.32-5-686
Pin: release o=Debian,a=proposed-updates
Pin-Priority: 999
Package: linux-libc-dev
Pin: release o=Debian,a=proposed-updates
Pin-Priority: 999
Package: macchanger
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Explanation: weirdness in chroot_apt install-binary
Package: *
Pin: release o=chroot_local-packages
......@@ -11,6 +43,10 @@ Package: *
Pin: release o=Debian,n=squeeze
Pin-Priority: 900
Package: *
Pin: origin backports.debian.org
Pin-Priority: 200
Package: *
Pin: origin live.debian.net
Pin-Priority: -1
......
......@@ -4,7 +4,7 @@
echo 'compiling and installing a custom udev-watchdog program'
apt-get install --yes gcc binutils libudev-dev
apt-get install --yes build-essential binutils libudev-dev
SRC="/usr/src/udev-watchdog.c"
DST="/usr/local/sbin/udev-watchdog"
......
browser.search.defaultenginename=Scroogle SSL Arabic
browser.search.selectedEngine=Scroogle SSL Arabic
browser.startup.homepage=https://check.torproject.org/?small=1
browser.startup.homepage=https://check.torproject.org/?lang=ar&small=1
......@@ -5,7 +5,7 @@
<em:id>branding@amnesia.boum.org</em:id>
<em:name>amnesia branding</em:name>
<em:version>0.1</em:version>
<em:version>0.2</em:version>
<em:creator>amnesia</em:creator>
......@@ -14,7 +14,7 @@
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>3.0</em:minVersion>
<em:maxVersion>3.6</em:maxVersion>
<em:maxVersion>4.0</em:maxVersion>
</Description>
</em:targetApplication>
......
<?xml version="1.0" encoding="UTF-8"?>
<foxyproxy mode="patterns" selectedTabIndex="0" toolsMenu="true" contextMenu="true" advancedMenus="false" previousMode="disabled" resetIconColors="true" useStatusBarPrefix="true" excludePatternsFromCycling="false" excludeDisabledFromCycling="false" ignoreProxyScheme="false"><random includeDirect="false" includeDisabled="false"/><statusbar icon="false" text="true" left="options" middle="cycle" right="contextmenu" width="0"/><toolbar left="options" middle="cycle" right="contextmenu"/><logg enabled="false" maxSize="500" noURLs="false" header="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
<foxyproxy mode="patterns" selectedTabIndex="0" toolsMenu="true" contextMenu="false" advancedMenus="false" previousMode="disabled" resetIconColors="true" useStatusBarPrefix="true" excludePatternsFromCycling="false" excludeDisabledFromCycling="false" ignoreProxyScheme="false"><random includeDirect="false" includeDisabled="false"/><statusbar icon="false" text="false" left="options" middle="cycle" right="contextmenu" width="0"/><toolbar left="options" middle="cycle" right="contextmenu"/><logg enabled="false" maxSize="500" noURLs="false" header="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Strict//EN&quot; &quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd&quot;&gt;
&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot;&gt;&lt;head&gt;&lt;title&gt;&lt;/title&gt;&lt;link rel=&quot;icon&quot; href=&quot;http://foxyproxy.mozdev.org/favicon.ico&quot;/&gt;&lt;link rel=&quot;shortcut icon&quot; href=&quot;http://foxyproxy.mozdev.org/favicon.ico&quot;/&gt;&lt;link rel=&quot;stylesheet&quot; href=&quot;http://foxyproxy.mozdev.org/styles/log.css&quot; type=&quot;text/css&quot;/&gt;&lt;/head&gt;&lt;body&gt;&lt;table class=&quot;log-table&quot;&gt;&lt;thead&gt;&lt;tr&gt;&lt;td class=&quot;heading&quot;&gt;${timestamp-heading}&lt;/td&gt;&lt;td class=&quot;heading&quot;&gt;${url-heading}&lt;/td&gt;&lt;td class=&quot;heading&quot;&gt;${proxy-name-heading}&lt;/td&gt;&lt;td class=&quot;heading&quot;&gt;${proxy-notes-heading}&lt;/td&gt;&lt;td class=&quot;heading&quot;&gt;${pattern-name-heading}&lt;/td&gt;&lt;td class=&quot;heading&quot;&gt;${pattern-heading}&lt;/td&gt;&lt;td class=&quot;heading&quot;&gt;${pattern-case-heading}&lt;/td&gt;&lt;td class=&quot;heading&quot;&gt;${pattern-type-heading}&lt;/td&gt;&lt;td class=&quot;heading&quot;&gt;${pattern-color-heading}&lt;/td&gt;&lt;td class=&quot;heading&quot;&gt;${pac-result-heading}&lt;/td&gt;&lt;td class=&quot;heading&quot;&gt;${error-msg-heading}&lt;/td&gt;&lt;/tr&gt;&lt;/thead&gt;&lt;tfoot&gt;&lt;tr&gt;&lt;td/&gt;&lt;/tr&gt;&lt;/tfoot&gt;&lt;tbody&gt;" row="&lt;tr&gt;&lt;td class=&quot;timestamp&quot;&gt;${timestamp}&lt;/td&gt;&lt;td class=&quot;url&quot;&gt;&lt;a href=&quot;${url}&quot;&gt;${url}&lt;/a&gt;&lt;/td&gt;&lt;td class=&quot;proxy-name&quot;&gt;${proxy-name}&lt;/td&gt;&lt;td class=&quot;proxy-notes&quot;&gt;${proxy-notes}&lt;/td&gt;&lt;td class=&quot;pattern-name&quot;&gt;${pattern-name}&lt;/td&gt;&lt;td class=&quot;pattern&quot;&gt;${pattern}&lt;/td&gt;&lt;td class=&quot;pattern-case&quot;&gt;${pattern-case}&lt;/td&gt;&lt;td class=&quot;pattern-type&quot;&gt;${pattern-type}&lt;/td&gt;&lt;td class=&quot;pattern-color&quot;&gt;${pattern-color}&lt;/td&gt;&lt;td class=&quot;pac-result&quot;&gt;${pac-result}&lt;/td&gt;&lt;td class=&quot;error-msg&quot;&gt;${error-msg}&lt;/td&gt;&lt;/tr&gt;" footer="&lt;/tbody&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;"/><warnings parentheses="true" confirmDeleteProxy="true"/><autoadd enabled="false" temp="false" reload="true" notify="true" notifyWhenCanceled="true" prompt="true"><match enabled="true" name="Dynamic AutoAdd Pattern" pattern="*://${3}${6}/*" isRegEx="false" isBlackList="false" isMultiLine="false" caseSensitive="false"/><match enabled="true" name="" pattern="*You are not authorized to view this page*" isRegEx="false" isBlackList="false" isMultiLine="true" caseSensitive="false"/></autoadd><quickadd enabled="false" temp="false" reload="true" notify="true" notifyWhenCanceled="true" prompt="true"><match enabled="true" name="Dynamic QuickAdd Pattern" pattern="*://${3}${6}/*" isRegEx="false" isBlackList="false" isMultiLine="false" caseSensitive="false"/></quickadd><defaultPrefs originalDisablePrefetch="false"/><proxies><proxy name="i2p router console" id="2404203472" notes="" enabled="true" mode="direct" selectedTabIndex="2" lastresort="false" animatedIcons="true" includeInCycle="true" color="#00FFFF" proxyDNS="true"><matches><match enabled="true" name="i2p router console" pattern="^http://(127.0.0.1)|(localhost):7657(/.*)?" isRegEx="true" isBlackList="false" isMultiLine="false" caseSensitive="false"/></matches><autoconf url="" loadNotification="true" errorNotification="true" autoReload="false" reloadFreqMins="60" disableOnBadPAC="true"/><manualconf host="" port="" socksversion="5" isSocks="false"/></proxy><proxy name="i2p" id="3035002503" notes="" enabled="true" mode="manual" selectedTabIndex="0" lastresort="false" animatedIcons="true" includeInCycle="true" color="#0000FF" proxyDNS="true"><matches><match enabled="true" name="eepsites" pattern="^https?://[^/]+\.i2p(:[0-9]{1,5})?(/.*)?" isRegEx="true" isBlackList="false" isMultiLine="false" caseSensitive="false"/></matches><autoconf url="" loadNotification="true" errorNotification="true" autoReload="false" reloadFreqMins="60" disableOnBadPAC="true"/><manualconf host="127.0.0.1" port="4444" socksversion="5" isSocks="false"/></proxy><proxy name="Tor http(s)" id="4274466714" notes="" enabled="true" mode="manual" selectedTabIndex="0" lastresort="false" animatedIcons="true" includeInCycle="true" color="#339900" proxyDNS="true"><matches><match enabled="true" name="http(s)" pattern="^https?://.*" isRegEx="true" isBlackList="false" isMultiLine="false" caseSensitive="false"/></matches><autoconf url="" loadNotification="true" errorNotification="true" autoReload="false" reloadFreqMins="60" disableOnBadPAC="true"/><manualconf host="127.0.0.1" port="8118" socksversion="5" isSocks="false"/></proxy><proxy name="Tor ftp" id="4183000176" notes="" enabled="false" mode="manual" selectedTabIndex="1" lastresort="false" animatedIcons="true" includeInCycle="true" color="#00FF00" proxyDNS="true"><matches><match enabled="true" name="ftp" pattern="^ftp://.*" isRegEx="true" isBlackList="false" isMultiLine="false" caseSensitive="false"/></matches><autoconf url="" loadNotification="true" errorNotification="true" autoReload="false" reloadFreqMins="60" disableOnBadPAC="true"/><manualconf host="127.0.0.1" port="2121" socksversion="5" isSocks="true"/></proxy><proxy name="Default" id="3892444566" notes="These are the settings that are used when no patterns match a URL." enabled="true" mode="manual" selectedTabIndex="0" lastresort="true" animatedIcons="false" includeInCycle="true" color="#000000" proxyDNS="true"><matches><match enabled="true" name="All" pattern="*" isRegEx="false" isBlackList="false" isMultiLine="false" caseSensitive="false"/></matches><autoconf url="" loadNotification="true" errorNotification="true" autoReload="false" reloadFreqMins="60" disableOnBadPAC="true"/><manualconf host="127.0.0.1" port="9050" socksversion="5" isSocks="true"/></proxy></proxies></foxyproxy>
\ No newline at end of file
......@@ -52,6 +52,9 @@ do_stop () {
print_text " Se borrará dentro de pocos segundos la memoria RAM del sistema..."
print_empty_line
print_text "Pueden aparecer problemas de visualización en el monitor durante esta operación."
print_empty_line
print_text " If the system does not power off automatically in a few seconds,"
print_text " it may mean the memory wiping has failed."
;;
fr_FR.UTF-8)
print_text " Vous pouvez maintenant retirer le CD / clé USB de boot."
......@@ -59,6 +62,20 @@ do_stop () {
print_text " La mémoire vive va être effacée dans quelques secondes..."
print_empty_line
print_text " Il est possible que l'affichage soit corrompu au cours de cette opération."
print_empty_line
print_text " Si l'ordinateur ne s'éteint pas automatiquement après quelques secondes,"
print_text " il est possible que l'effacement de la mémoire ait échoué."
;;
it*)
print_text " Adesso puoi rimuovere il cd o la penna USB."
print_empty_line
print_text " La memoria del computer verra' cancellata tra pochi secondi..."
print_empty_line
print_text " Il display potra' essere corrotto durante questa operazione."
print_empty_line
print_text " Se vostro PC non si spegnera' automaticamente in pochi secondi"
print_text " la cancellazione della memoria putrebbe essere incompleta."
;;
*)
print_text " You can now remove the boot CD or USB stick."
......@@ -66,6 +83,9 @@ do_stop () {
print_text " The system memory is going to be wiped in a few seconds..."
print_empty_line
print_text " Display might be corrupted during this operation."
print_empty_line
print_text " If the system does not power off automatically in a few seconds,"
print_text " it may mean the memory wiping has failed."
;;
esac
......@@ -74,7 +94,7 @@ do_stop () {
print_empty_line
/bin/sleep 5
/sbin/kexec -e
/sbin/kexec -e --reset-vga
}
case "$1" in
......
. /etc/amnesia/environment
export TAILS_WIKI_SUPPORTED_LANGUAGES
......@@ -159,9 +159,12 @@ sub get_new_entries {
my $base_url = shift;
my $since_dt = shift;
my $separator = '';
$separator = '/' unless $base_url =~ m{/\z}xms;
my @try_urls = (
$base_url . '/index.' . current_lang() . '.atom',
$base_url . '/index.en.atom',
$base_url . $separator . 'index.' . current_lang() . '.atom',
$base_url . $separator . 'index.en.atom',
);
my $feed_str;
......
......@@ -44,6 +44,13 @@
</value>
</entry>
<entry>
<key>interface/menus_have_icons</key>
<value>
<bool>true</bool>
</value>
</entry>
<entry>
<key>peripherals/keyboard/general/groupPerWindow</key>
<value>
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-11-20 16:07+0100\n"
"POT-Creation-Date: 2011-04-29 15:28+0200\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"
......@@ -17,14 +17,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:38
#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:55
msgid "Synchronizing the system's clock"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:39
#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:56
msgid "Tor needs an accurate clock to work properly. Please wait..."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:69
#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:85
msgid "Failed to synchronize the clock!"
msgstr ""
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-09-25 02:51+0200\n"
"POT-Creation-Date: 2011-04-29 15:28+0200\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"
......@@ -26,10 +26,10 @@ msgstr ""
msgid "atom_str was passed an undefined argument"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-security-check:173
#: config/chroot_local-includes/usr/local/bin/tails-security-check:176
msgid "Empty fetched feed."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-security-check:190
#: config/chroot_local-includes/usr/local/bin/tails-security-check:193
msgid "This version of Tails has known security issues:"
msgstr ""
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-11-20 16:07+0100\n"
"POT-Creation-Date: 2011-04-29 15:28+0200\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"
......@@ -17,14 +17,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:38
#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:55
msgid "Synchronizing the system's clock"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:39
#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:56
msgid "Tor needs an accurate clock to work properly. Please wait..."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:69
#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:85
msgid "Failed to synchronize the clock!"
msgstr ""
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