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

Merge branch 'master' into devel

parents 4e0d1cd7 809af59a
......@@ -476,7 +476,7 @@ etc/init.d/udev 32126
lib/udev/create_static_nodes 32125
etc/udev/links.conf 32124
sbin/udevd 32123
lib/modules/3.10-3-686-pae/modules.devname 32122
lib/modules/3.12-1-686-pae/modules.devname 32122
lib/udev/rules.d/10-blackberry.rules 32121
lib/udev/rules.d/40-hplip.rules 32120
lib/udev/rules.d/40-usb_modeswitch.rules 32119
......@@ -566,54 +566,54 @@ lib/linux-sound-base/noOSS.modprobe.conf 32036
etc/modprobe.d/no-pc-speaker.conf 32035
etc/modprobe.d/open-vm-tools.conf 32034
etc/modprobe.d/radeon-kms.conf 32033
lib/modules/3.10-3-686-pae/modules.alias.bin 32032
lib/modules/3.10-3-686-pae/modules.dep.bin 32031
lib/modules/3.10-3-686-pae/kernel/drivers/virtio/virtio_balloon.ko 32030
lib/modules/3.10-3-686-pae/modules.builtin.bin 32029
lib/modules/3.10-3-686-pae/kernel/drivers/char/virtio_console.ko 32028
lib/modules/3.10-3-686-pae/kernel/drivers/input/serio/serio_raw.ko 32027
lib/modules/3.12-1-686-pae/modules.alias.bin 32032
lib/modules/3.12-1-686-pae/modules.dep.bin 32031
lib/modules/3.12-1-686-pae/kernel/drivers/virtio/virtio_balloon.ko 32030
lib/modules/3.12-1-686-pae/modules.builtin.bin 32029
lib/modules/3.12-1-686-pae/kernel/drivers/char/virtio_console.ko 32028
lib/modules/3.12-1-686-pae/kernel/drivers/input/serio/serio_raw.ko 32027
lib/udev/hwclock-set 32026
lib/modules/3.10-3-686-pae/kernel/drivers/input/evdev.ko 32025
lib/modules/3.12-1-686-pae/kernel/drivers/input/evdev.ko 32025
lib/udev/lmt-udev 32024
lib/modules/3.10-3-686-pae/kernel/drivers/acpi/button.ko 32023
lib/modules/3.12-1-686-pae/kernel/drivers/acpi/button.ko 32023
sbin/blkid 32022
lib/modules/3.10-3-686-pae/kernel/drivers/char/tpm/tpm_bios.ko 32021
lib/modules/3.10-3-686-pae/kernel/crypto/aes_generic.ko 32020
lib/modules/3.12-1-686-pae/kernel/drivers/char/tpm/tpm_bios.ko 32021
lib/modules/3.12-1-686-pae/kernel/crypto/aes_generic.ko 32020
lib/udev/input_id 32019
usr/share/misc/pci.ids 32018
lib/udev/hotplug.functions 32017
lib/modules/3.10-3-686-pae/kernel/drivers/thermal/thermal_sys.ko 32016
lib/modules/3.12-1-686-pae/kernel/drivers/thermal/thermal_sys.ko 32016
lib/udev/net.agent 32015
lib/modules/3.10-3-686-pae/kernel/sound/core/snd-page-alloc.ko 32014
lib/modules/3.12-1-686-pae/kernel/sound/core/snd-page-alloc.ko 32014
lib/udev/udisks-part-id 32013
lib/udev/fstab_import 32012
lib/udev/path_id 32011
lib/libudev.so.0.9.3 32010
lib/modules/3.10-3-686-pae/kernel/drivers/acpi/processor.ko 32009
lib/modules/3.10-3-686-pae/kernel/drivers/char/tpm/tpm.ko 32008
lib/modules/3.10-3-686-pae/kernel/arch/x86/crypto/aes-i586.ko 32007
lib/modules/3.10-3-686-pae/kernel/drivers/input/mouse/psmouse.ko 32005
lib/modules/3.10-3-686-pae/kernel/drivers/i2c/i2c-core.ko 32004
lib/modules/3.10-3-686-pae/kernel/crypto/cryptd.ko 32003
lib/modules/3.12-1-686-pae/kernel/drivers/acpi/processor.ko 32009
lib/modules/3.12-1-686-pae/kernel/drivers/char/tpm/tpm.ko 32008
lib/modules/3.12-1-686-pae/kernel/arch/x86/crypto/aes-i586.ko 32007
lib/modules/3.12-1-686-pae/kernel/drivers/input/mouse/psmouse.ko 32005
lib/modules/3.12-1-686-pae/kernel/drivers/i2c/i2c-core.ko 32004
lib/modules/3.12-1-686-pae/kernel/crypto/cryptd.ko 32003
usr/sbin/laptop_mode 32002
lib/modules/3.10-3-686-pae/kernel/sound/soundcore.ko 32001
lib/modules/3.12-1-686-pae/kernel/sound/soundcore.ko 32001
lib/libparted.so.0.0.1 32000
lib/modules/3.10-3-686-pae/kernel/drivers/char/tpm/tpm_tis.ko 31999
lib/modules/3.10-3-686-pae/kernel/drivers/i2c/busses/i2c-piix4.ko 31998
lib/modules/3.10-3-686-pae/kernel/sound/core/snd.ko 31997
lib/modules/3.10-3-686-pae/kernel/arch/x86/crypto/aesni-intel.ko 31996
lib/modules/3.12-1-686-pae/kernel/drivers/char/tpm/tpm_tis.ko 31999
lib/modules/3.12-1-686-pae/kernel/drivers/i2c/busses/i2c-piix4.ko 31998
lib/modules/3.12-1-686-pae/kernel/sound/core/snd.ko 31997
lib/modules/3.12-1-686-pae/kernel/arch/x86/crypto/aesni-intel.ko 31996
bin/which 31995
lib/modules/3.10-3-686-pae/kernel/arch/x86/crypto/crc32c-intel.ko 31994
lib/modules/3.12-1-686-pae/kernel/arch/x86/crypto/crc32c-intel.ko 31994
etc/laptop-mode/conf.d/ac97-powersave.conf 31993
lib/modules/3.10-3-686-pae/kernel/sound/core/seq/snd-seq-device.ko 31992
lib/modules/3.10-3-686-pae/kernel/sound/core/snd-timer.ko 31991
lib/modules/3.10-3-686-pae/kernel/sound/core/seq/snd-seq.ko 31990
lib/modules/3.10-3-686-pae/kernel/sound/core/snd-pcm.ko 31989
lib/modules/3.12-1-686-pae/kernel/sound/core/seq/snd-seq-device.ko 31992
lib/modules/3.12-1-686-pae/kernel/sound/core/snd-timer.ko 31991
lib/modules/3.12-1-686-pae/kernel/sound/core/seq/snd-seq.ko 31990
lib/modules/3.12-1-686-pae/kernel/sound/core/snd-pcm.ko 31989
bin/vmmouse_detect 31988
etc/laptop-mode/conf.d/auto-hibernate.conf 31987
lib/libdevmapper.so.1.02.1 31986
lib/modules/3.10-3-686-pae/kernel/sound/ac97_bus.ko 31985
lib/modules/3.10-3-686-pae/kernel/sound/pci/ac97/snd-ac97-codec.ko 31984
lib/modules/3.12-1-686-pae/kernel/sound/ac97_bus.ko 31985
lib/modules/3.12-1-686-pae/kernel/sound/pci/ac97/snd-ac97-codec.ko 31984
etc/laptop-mode/conf.d/battery-level-polling.conf 31983
etc/laptop-mode/conf.d/bluetooth.conf 31982
etc/laptop-mode/conf.d/configuration-file-control.conf 31981
......@@ -639,7 +639,7 @@ etc/laptop-mode/conf.d/wireless-iwl-power.conf 31962
etc/laptop-mode/conf.d/wireless-power.conf 31961
usr/bin/logger 31960
etc/laptop-mode/laptop-mode.conf 31959
lib/modules/3.10-3-686-pae/kernel/sound/pci/snd-intel8x0.ko 31958
lib/modules/3.12-1-686-pae/kernel/sound/pci/snd-intel8x0.ko 31958
usr/bin/flock 31956
lib/udev/write_net_rules 31954
lib/udev/rule_generator.functions 31953
......@@ -731,42 +731,42 @@ lib/libip4tc.so.0.0.0 31862
lib/libxtables.so.4.0.0 31861
sbin/ip6tables-multi 31860
lib/libip6tc.so.0.0.0 31859
lib/modules/3.10-3-686-pae/kernel/net/netfilter/x_tables.ko 31858
lib/modules/3.10-3-686-pae/kernel/net/ipv4/netfilter/ip_tables.ko 31857
lib/modules/3.10-3-686-pae/kernel/net/ipv4/netfilter/nf_defrag_ipv4.ko 31856
lib/modules/3.10-3-686-pae/kernel/net/netfilter/nf_conntrack.ko 31855
lib/modules/3.10-3-686-pae/kernel/net/ipv4/netfilter/nf_conntrack_ipv4.ko 31854
lib/modules/3.10-3-686-pae/kernel/net/ipv4/netfilter/nf_nat.ko 31853
lib/modules/3.10-3-686-pae/kernel/net/ipv4/netfilter/iptable_nat.ko 31852
lib/modules/3.12-1-686-pae/kernel/net/netfilter/x_tables.ko 31858
lib/modules/3.12-1-686-pae/kernel/net/ipv4/netfilter/ip_tables.ko 31857
lib/modules/3.12-1-686-pae/kernel/net/ipv4/netfilter/nf_defrag_ipv4.ko 31856
lib/modules/3.12-1-686-pae/kernel/net/netfilter/nf_conntrack.ko 31855
lib/modules/3.12-1-686-pae/kernel/net/ipv4/netfilter/nf_conntrack_ipv4.ko 31854
lib/modules/3.12-1-686-pae/kernel/net/ipv4/netfilter/nf_nat.ko 31853
lib/modules/3.12-1-686-pae/kernel/net/ipv4/netfilter/iptable_nat.ko 31852
etc/protocols 31851
lib/xtables/libipt_REDIRECT.so 31850
lib/modules/3.10-3-686-pae/kernel/net/ipv4/netfilter/ipt_REDIRECT.ko 31849
lib/modules/3.10-3-686-pae/kernel/net/ipv4/netfilter/iptable_filter.ko 31848
lib/modules/3.12-1-686-pae/kernel/net/ipv4/netfilter/ipt_REDIRECT.ko 31849
lib/modules/3.12-1-686-pae/kernel/net/ipv4/netfilter/iptable_filter.ko 31848
lib/xtables/libxt_state.so 31847
lib/xtables/libxt_standard.so 31846
lib/xtables/libxt_tcp.so 31845
lib/xtables/libxt_owner.so 31844
lib/modules/3.10-3-686-pae/kernel/net/netfilter/xt_owner.ko 31843
lib/modules/3.12-1-686-pae/kernel/net/netfilter/xt_owner.ko 31843
lib/xtables/libxt_multiport.so 31842
lib/modules/3.10-3-686-pae/kernel/net/netfilter/xt_multiport.ko 31841
lib/modules/3.12-1-686-pae/kernel/net/netfilter/xt_multiport.ko 31841
lib/xtables/libxt_udp.so 31840
etc/services 31839
lib/xtables/libipt_LOG.so 31838
lib/xtables/libipt_REJECT.so 31837
lib/modules/3.10-3-686-pae/kernel/net/netfilter/xt_state.ko 31836
lib/modules/3.10-3-686-pae/kernel/net/netfilter/xt_tcpudp.ko 31835
lib/modules/3.10-3-686-pae/kernel/net/ipv4/netfilter/ipt_LOG.ko 31834
lib/modules/3.10-3-686-pae/kernel/net/ipv4/netfilter/ipt_REJECT.ko 31833
lib/modules/3.10-3-686-pae/kernel/net/ipv6/netfilter/ip6_tables.ko 31832
lib/modules/3.10-3-686-pae/kernel/net/ipv6/netfilter/ip6table_filter.ko 31831
lib/modules/3.12-1-686-pae/kernel/net/netfilter/xt_state.ko 31836
lib/modules/3.12-1-686-pae/kernel/net/netfilter/xt_tcpudp.ko 31835
lib/modules/3.12-1-686-pae/kernel/net/ipv4/netfilter/ipt_LOG.ko 31834
lib/modules/3.12-1-686-pae/kernel/net/ipv4/netfilter/ipt_REJECT.ko 31833
lib/modules/3.12-1-686-pae/kernel/net/ipv6/netfilter/ip6_tables.ko 31832
lib/modules/3.12-1-686-pae/kernel/net/ipv6/netfilter/ip6table_filter.ko 31831
lib/xtables/libip6t_LOG.so 31830
lib/xtables/libip6t_REJECT.so 31829
lib/modules/3.10-3-686-pae/kernel/net/ipv6/netfilter/nf_defrag_ipv6.ko 31828
lib/modules/3.10-3-686-pae/kernel/net/ipv6/netfilter/nf_conntrack_ipv6.ko 31827
lib/modules/3.10-3-686-pae/kernel/net/ipv6/netfilter/ip6t_LOG.ko 31826
lib/modules/3.10-3-686-pae/kernel/net/ipv6/netfilter/ip6t_REJECT.ko 31825
lib/modules/3.12-1-686-pae/kernel/net/ipv6/netfilter/nf_defrag_ipv6.ko 31828
lib/modules/3.12-1-686-pae/kernel/net/ipv6/netfilter/nf_conntrack_ipv6.ko 31827
lib/modules/3.12-1-686-pae/kernel/net/ipv6/netfilter/ip6t_LOG.ko 31826
lib/modules/3.12-1-686-pae/kernel/net/ipv6/netfilter/ip6t_REJECT.ko 31825
etc/init.d/fuse 31824
lib/modules/3.10-3-686-pae/kernel/fs/fuse/fuse.ko 31823
lib/modules/3.12-1-686-pae/kernel/fs/fuse/fuse.ko 31823
etc/init.d/kbd 31820
etc/kbd/config 31819
etc/environment 31818
......@@ -912,7 +912,7 @@ etc/default/rsync 31673
etc/init.d/saned 31672
etc/default/saned 31671
etc/init.d/spice-vdagent 31670
lib/modules/3.10-3-686-pae/kernel/drivers/input/misc/uinput.ko 31669
lib/modules/3.12-1-686-pae/kernel/drivers/input/misc/uinput.ko 31669
usr/sbin/spice-vdagentd 31668
etc/init.d/kexec-load 31667
etc/init.d/tails-kexec 31666
......@@ -1294,7 +1294,7 @@ usr/lib/at-spi/at-spi-registryd 31285
usr/lib/libspi.so.0.10.11 31284
usr/lib/gnome-settings-daemon/gnome-settings-daemon 31283
usr/bin/spice-vdagent 31282
lib/modules/3.10-3-686-pae/kernel/drivers/input/joydev.ko 31281
lib/modules/3.12-1-686-pae/kernel/drivers/input/joydev.ko 31281
usr/lib/libbonobo-2.so.0.0.0 31280
usr/lib/gnome-settings-daemon-2.0/a11y-keyboard.gnome-settings-plugin 31279
usr/lib/libbonobo-activation.so.4.0.0 31278
......
......@@ -7,7 +7,10 @@ tails (0.23) UNRELEASED; urgency=low
tails (0.22.1~rc1) unstable; urgency=medium
* Security fixes
- Update NSS to 3.14.5-1~bpo60+1.
- Upgrade the web browser to 24.3.0esr-0+tails1~bpo60+2
(Firefox 24.3.0esr + Iceweasel patches + Torbrowser patches).
- Upgrade NSS to 3.14.5-1~bpo60+1.
- Upgrade Pidgin to 2.10.8.
- Workaround browser size fingerprinting issue by using small icons
in the web browser's navigation toolbar (Closes: #6377).
We're actually hit by Tor#9268, and this is the best workaround gk
......
......@@ -20,10 +20,7 @@ So read on to find out how you can make a difference in Tails.
<div class="contribute-roles-1">
<h2>Donate</h2>
<div class="contribute-role" id="donate">
<img src="icon_6409.svg" />
<img src="icon_19538.svg" />
<img src="icon_285.svg" />
<img src="icon_21216.svg" />
<p>Donating speeds up the development of Tails.</p>
<ul>
<li>[[Make a donation|contribute/how/donate]]</li>
......@@ -36,9 +33,6 @@ So read on to find out how you can make a difference in Tails.
<div class="contribute-role" id="content-writer">
<h3>Writer</h3>
<img src="icon_18907.svg" />
<img src="icon_26704.svg" />
<img src="icon_1520.svg" />
<img src="icon_15262.svg" />
<p>Good writers can make Tails accessible to more people.</p>
<ul>
<li>[[Improve documentation|contribute/how/documentation]]</li>
......@@ -48,8 +42,6 @@ So read on to find out how you can make a difference in Tails.
<div class="contribute-role" id="translator">
<h3>Translator</h3>
<img src="icon_5735.svg" />
<img src="icon_987.svg" />
<img src="icon_24074.svg" />
<p>Translators can allow more people around the world to use Tails.</p>
<ul>
<li>[[Improve Tails in your own language|contribute/how/translate]]</li>
......@@ -58,7 +50,6 @@ So read on to find out how you can make a difference in Tails.
<div class="contribute-role" id="speaker">
<h3>Speaker</h3>
<img src="icon_1186_cut.svg" />
<img src="icon_1186.svg" />
<p>Speakers can advocate Tails to all kinds of public.</p>
<ul>
<li>[[Talk at events|contribute/how/promote]]</li>
......@@ -71,7 +62,6 @@ So read on to find out how you can make a difference in Tails.
<div class="contribute-role" id="developer">
<h3>Software developer</h3>
<img src="icon_18033.svg" />
<img src="icon_21297.svg" />
<p>Developers with very diverse skills can improve Tails code.</p>
<ul>
<li>[[Fix a bug|contribute/how/code]]</li>
......@@ -81,8 +71,6 @@ So read on to find out how you can make a difference in Tails.
<div class="contribute-role" id="sysadmin">
<h3>System administrator</h3>
<img src="icon_8949.svg" />
<img src="icon_4684.svg" />
<img src="icon_14182.svg" />
<p>System administrators can contribute to the infrastructure behind Tails.</p>
<ul>
<li>[[Run a BitTorrent seed|contribute/how/mirror]]</li>
......@@ -90,11 +78,8 @@ So read on to find out how you can make a difference in Tails.
</ul>
</div>
<div class="contribute-role" id="designer">
<img src="icon_8499.svg" />
<img src="icon_6552.svg" />
<img src="icon_14005.svg" />
<img src="icon_18203.svg" />
<h3>Designer</h3>
<img src="icon_9198.svg" />
<p>Designers can make Tails easier to use and more appealing.</p>
<ul>
<li>[[Improve the website|contribute/how/website]]</li>
......
This diff is collapsed.
......@@ -67,6 +67,10 @@ stuff ready in time for the security announce.
* `cd` into our Iceweasel Git directory.
* Checkout the `tails/master` branch.
* Unapply all quilt patches and commit:
quilt pop -a
* Get yourself a new upstream branch:
git branch -D upstream
......@@ -98,13 +102,12 @@ stuff ready in time for the security announce.
quilt push -a
* `git rm` files deleted by quilt patches
* `git add` files created by quilt patches
It might be that the last patch (`configure.patch`) fails. Ignore it
for now.
* Commit:
git commit -a -m 'Apply all quilt patches.'
git add . && git reset HEAD .pc && git commit -a -m 'Apply all quilt patches.'
<a id="new-iceweasel-release"></a>
......@@ -246,7 +249,7 @@ and commit:
git commit -a -m 'Remove Torbrowser patches.'
* Import the latest TorBroswer patches:
* Import the latest TorBrowser patches:
- Ensure you have Mike Perry's latest stuff available:
......@@ -282,9 +285,7 @@ and commit:
* Apply Torbrowser patches:
quilt push -a && git commit -a -m 'Apply Torbrowser patches.'
* Add untracked files *but* `.pc` and `commit --amend`.
quilt push -a && git add . && git reset HEAD .pc && git commit -a -m 'Apply Torbrowser patches.'
* Push to Git:
......@@ -326,7 +327,9 @@ If you have no available non-Tails setup to comfortably test these
packages, then skip this step.
* Build for unstable and the architecture you can test on (most likely
amd64), e.g. using our [[contribute/Debian_package_builder]].
amd64), e.g. using our [[contribute/Debian_package_builder]].
**Note:** if building locally in a ramdisk, it needs to be at least
14GB large.
* Copy `browser/app/profile/000-tor-browser.js` into
`/etc/iceweasel/pref/` on the test system.
* Install and test the resulting packages.
......@@ -392,8 +395,7 @@ E.g. `configure.patch` does not apply, or the build fails since
`{js/src/,}configure.in` was modified but `{js/src/,}configure` was
not refreshed.
In a nutshell (that is, with most of the gory quilt and Git details
skipped) the solution is to:
In a nutshell, the solution is to:
1. Make sure the patches that modify `{js/src/,}configure.in` are
applied (this is the case after a `quilt push -a`, that is during
......
......@@ -2,25 +2,28 @@
# Tasks
* When the new front desk's shift begins:
- Do user support: reply bug reports, reply to users on tails-support@,
tails@
- Do user support by email:
- Reply to bug reports received on tails-bugs@boum.org (empty report might
be silently ignored).
- Make sure everything is replied on tails-support@boum.org, while leaving
space for other people to participate.
- Reply random incoming emails on tails@boum.org.
- Improve incrementally the FAQ based on the work done by email, and do
whatever small tasks will make the frontdesk job's easier in the future.
- Announce public meeting and low-hanging fruits session:
* tails-dev@
* Twitter
* tails-dev@boum.org Twitter
* [TWN](https://trac.torproject.org/projects/tor/wiki/TorWeeklyNews)
(follow the *Next steps* link)
- Write report of low-hanging fruits session, and send it to
tails-dev@ if attended
- Write & publish the minutes of the public meeting if attended
- Publish the monthly report
- Write report of low-hanging fruits session, and send it to tails-dev@ if
attended.
- Write & publish the minutes of the public meeting if attended.
- Publish the monthly report.
- Triage tickets created by non-developers:
* if this is asking something we have already decided we will not
do, close as rejected
* if that's a duplicate, close as such
* set the correct status, category and type of work
* set priority to Low if it's a feature request, unless we have
* if that's a duplicate, close as such set the correct status, category and
* type of work set priority to Low if it's a feature request, unless we have
decided we feel commited to implement it
* if you feel it is important enough, but discussion is needed,
then start the discussion to tails-dev@
- Do user support on IRC if you feel like it.
......@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2013-12-17 11:02+0100\n"
"POT-Creation-Date: 2014-02-05 10:59+0100\n"
"PO-Revision-Date: 2014-01-12 19:41-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"
......@@ -28,7 +29,6 @@ msgid "[[!traillink Warnings!|about/warning]]"
msgstr "[[!traillink Avertissements!|about/warning]]"
#. type: Bullet: ' - '
#| msgid "[[!traillink Features|about/features]]"
msgid "[[!traillink Features_and_included_software|about/features]]"
msgstr "[[!traillink Fonctionnalités_et_logiciels_inclus|about/features]]"
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2013-12-22 19:55+0100\n"
"POT-Creation-Date: 2014-02-01 21:58+0100\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"
......@@ -22,7 +22,10 @@ msgid "[[!meta title=\"Installing onto a USB Stick or SD card\"]]\n"
msgstr ""
#. type: Plain text
msgid "Tails includes a custom installer for USB sticks and SD cards."
#, no-wrap
msgid ""
"Tails includes <span class=\"application\">Tails Installer</span> a custom\n"
"installer for USB sticks and SD cards.\n"
msgstr ""
#. type: Plain text
......@@ -52,12 +55,12 @@ msgstr ""
msgid ""
"Using <span class=\"application\">Tails Installer</span> allows you to\n"
"later **[[create a persistent volume|persistence]]** in the free space\n"
"left on the device. This requires a USB stick or SD card of **at least 4 GB**.\n"
"left on the device.\n"
msgstr ""
#. type: Title =
#, no-wrap
msgid "Instructions\n"
msgid "Using Tails Installer\n"
msgstr ""
#. type: Plain text
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
"POT-Creation-Date: 2014-01-07 17:16+0100\n"
"POT-Creation-Date: 2014-02-01 21:58+0100\n"
"PO-Revision-Date: 2014-01-03 12:17-0000\n"
"Last-Translator: \n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
......@@ -22,7 +22,11 @@ msgid "[[!meta title=\"Installing onto a USB Stick or SD card\"]]\n"
msgstr "[[!meta title=\"Installation sur une clé USB ou une carte SD\"]]\n"
#. type: Plain text
msgid "Tails includes a custom installer for USB sticks and SD cards."
#, fuzzy, no-wrap
#| msgid "Tails includes a custom installer for USB sticks and SD cards."
msgid ""
"Tails includes <span class=\"application\">Tails Installer</span> a custom\n"
"installer for USB sticks and SD cards.\n"
msgstr "Tails inclut son propre installeur pour clé USB ou carte SD."
#. type: Plain text
......@@ -55,11 +59,15 @@ msgstr ""
"installation/manual]]**, si vous ne pouvez pas utiliser de DVD."
#. type: Plain text
#, no-wrap
#, fuzzy, no-wrap
#| msgid ""
#| "Using <span class=\"application\">Tails Installer</span> allows you to\n"
#| "later **[[create a persistent volume|persistence]]** in the free space\n"
#| "left on the device. This requires a USB stick or SD card of **at least 4 GB**.\n"
msgid ""
"Using <span class=\"application\">Tails Installer</span> allows you to\n"
"later **[[create a persistent volume|persistence]]** in the free space\n"
"left on the device. This requires a USB stick or SD card of **at least 4 GB**.\n"
"left on the device.\n"
msgstr ""
"Utiliser l'<span class=\"application\">Installeur de Tails</span> vous permet de\n"
"**[[créer un volume persistant|persistence]]** sur l'espace libre de la clé USB. Cela\n"
......@@ -67,8 +75,8 @@ msgstr ""
#. type: Title =
#, no-wrap
msgid "Instructions\n"
msgstr "Instructions\n"
msgid "Using Tails Installer\n"
msgstr ""
#. type: Plain text
#, no-wrap
......@@ -181,3 +189,6 @@ msgid ""
msgstr ""
"<p>Une fois l'installation terminée, vous pouvez [[démarrer Tails|/download/#start]]\n"
"depuis ce nouveau périphérique.</p>\n"
#~ msgid "Instructions\n"
#~ msgstr "Instructions\n"
[[!meta title="Installing onto a USB Stick or SD card"]]
Tails includes a custom installer for USB sticks and SD cards.
Tails includes <span class="application">Tails Installer</span> a custom
installer for USB sticks and SD cards.
In order to use <span class="application">Tails Installer</span>, you need
to start Tails from another media, and clone it onto the device of your
......@@ -13,10 +14,10 @@ choice, USB stick or SD card. To do that, you can either:
Using <span class="application">Tails Installer</span> allows you to
later **[[create a persistent volume|persistence]]** in the free space
left on the device. This requires a USB stick or SD card of **at least 4 GB**.
left on the device.
Instructions
============
Using Tails Installer
=====================
<div class="caution">
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2013-12-22 19:55+0100\n"
"POT-Creation-Date: 2014-02-01 21:58+0100\n"
"PO-Revision-Date: 2012-09-28 10:44-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -22,11 +22,12 @@ msgid "[[!meta title=\"Installing onto a USB Stick or SD card\"]]\n"
msgstr "[[!meta title=\"Instalando em uma memória USB\"]]\n"
#. type: Plain text
#, fuzzy
#, fuzzy, no-wrap
#| msgid "Tails, version 0.11 or later, includes a custom USB installer."
msgid "Tails includes a custom installer for USB sticks and SD cards."
msgstr ""
"Tails, versão 0.11 ou superior, inclui um instalador USB personalizado."
msgid ""
"Tails includes <span class=\"application\">Tails Installer</span> a custom\n"
"installer for USB sticks and SD cards.\n"
msgstr "Tails, versão 0.11 ou superior, inclui um instalador USB personalizado."
#. type: Plain text
#, fuzzy, no-wrap
......@@ -78,7 +79,7 @@ msgstr ""
msgid ""
"Using <span class=\"application\">Tails Installer</span> allows you to\n"
"later **[[create a persistent volume|persistence]]** in the free space\n"
"left on the device. This requires a USB stick or SD card of **at least 4 GB**.\n"
"left on the device.\n"
msgstr ""
"O <span class=\"application\">Tails Usb installer</span> te permite **[[criar um\n"
"volume persistente|persistence]]** no espaço livre da sua memória USB. Isto requer\n"
......@@ -86,8 +87,8 @@ msgstr ""
#. type: Title =
#, no-wrap
msgid "Instructions\n"
msgstr "Instruções\n"
msgid "Using Tails Installer\n"
msgstr ""
#. type: Plain text
#, no-wrap
......@@ -241,3 +242,6 @@ msgid ""
msgstr ""
"<p>Depois que a instalação terminar, você pode [[iniciar o Tails|/download/#start]]\n"
"a partir desta nova memória USB.</p>\n"
#~ msgid "Instructions\n"
#~ msgstr "Instruções\n"
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"POT-Creation-Date: 2014-01-31 18:18+0100\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"
......@@ -113,6 +113,10 @@ msgstr ""
msgid "[[!img windows/07-create.png link=no alt=\"Create\"]]\n"
msgstr ""
#. type: Plain text
msgid "Then safely remove the USB stick from the computer."
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<div class=\"next\">\n"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2013-10-28 02:41+0000\n"
"POT-Creation-Date: 2014-01-31 18:18+0100\n"
"PO-Revision-Date: 2013-01-29 14:51-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -116,6 +116,10 @@ msgstr "Cliquez sur 'Create'"
msgid "[[!img windows/07-create.png link=no alt=\"Create\"]]\n"
msgstr "[[!img windows/07-create.png link=no alt=\"Create\"]]\n"
#. type: Plain text
msgid "Then safely remove the USB stick from the computer."
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<div class=\"next\">\n"
......
......@@ -37,6 +37,8 @@ visit [http://www.pendrivelinux.com/](http://www.pendrivelinux.com/universal-usb
[[!img windows/07-create.png link=no alt="Create"]]
Then safely remove the USB stick from the computer.
<div class="next">
<p>After the installation completes, you can [[start Tails|/download/#start]]
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2013-10-24 02:30+0300\n"
"POT-Creation-Date: 2014-01-31 18:18+0100\n"
"PO-Revision-Date: 2012-11-06 16:05-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -118,6 +118,10 @@ msgstr "Clique em 'Create'"
msgid "[[!img windows/07-create.png link=no alt=\"Create\"]]\n"
msgstr "[[!img windows/07-create.png link=no alt=\"Criar\"]]\n"
#. type: Plain text
msgid "Then safely remove the USB stick from the computer."
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<div class=\"next\">\n"
......