Commit 2e9425dc authored by anonym's avatar anonym
Browse files

Merge remote-tracking branch 'origin/master' into testing

parents c9d4dfdf 22ff975d
Rationale
=========
In [[!tails_ticket 9264]], we're discussing and drafting our needs for more
isotesters. From some statistics of the number of automated builds per month,
we concluded we need to be able to run at least 1000 more test suites per
month, which means begin able to host at least 8 more isotesters.
month, which means being able to host at least 8 more isotesters.
Note: our workload parallelizes poorly over multiple CPU cores, so
perhaps getting _less_ additional ISO testers, but each with faster
CPU clock, would be more efficient.
Estimates
=========
......@@ -15,13 +18,13 @@ isotester means:
* 20G RAM
* 25G HDD (10G system+data, 15G tmp)
* 3 CPU cores (+1 for the qemu process on the host)
* 3 CPU threads
So 8 isotesters would mean:
* 160G RAM
* 200G HDD
* 32 CPU cores max
* 24 CPU threads max
From there, it seems unlikely we could host that on Lizard, and we are
back on the research about new hardware for isotesters.
......@@ -30,12 +33,7 @@ Hardware
========
Given the amount of RAM and CPUs required, it seems close to [[Lizard's
specs|blueprint/hardware_for_automated_tests]]. If we stick on the CPUs, we
probably need the same kind, with 12 cores and in the end 48 CPU threads.
If we settle on this, we would have a bit of room for the future to be able to
run up to 11 isotesters (44 CPUs, 275-330G HDD, 220G RAM), running theorically
1320 test suites per month on this sole box.
specs|blueprint/hardware_for_automated_tests]].
We still need to decide if we would use faster (as in Ghz) CPUs than the one
Lizard has (Low voltages versions). In this case the price jumps quite a bit,
......@@ -44,7 +42,51 @@ each of Lizard's ones).
The following price estimations are based on interpromicro.com ones.
## Option A: Low voltage CPUs
## Candidate options
We currently prefer option C if it's doable, and option D otherwise.
### Option C: 12 cores, upgradable by adding a CPU
XXX:
* can we plug one CPU only on a 2-sockets SMP mobo?
=> ask taggart
* this is for 8 VMs with 3 vcpus each; if we can instead go for 4 VMs
with 3 real cores each, then we need less RAM (~ $1000 less)
=> depends on the outcome of [[!tails_ticket 10971]]
* 1 x Super X10DRi, 2x GB/i350 LAN, 10x SATA3(C612)+R, IPMI, DDR4(1TB) - $390
* 1 x Intel® E5-2690v3-2.6Ghz/12C, 30M, 135W LGA2011 CPU - $2124
* 16 x 16GB D4-2133Mhz, ECC/Reg 288-Pin Sdram - $2100
* 2 x Samsung 850 EVO, 500GB 2.5" SATA3 SSD(3D V-NAMD) - $400
* 1 x Heatsink - $50
* 1 x Supermicro SC113TQ-600W, 1U RM, WIO, 8x 2.5" SAS/SATA 600W - $350
Total --- **$5424**
### Option D: 2*6 cores, upgradable by replacing CPUs
XXX:
* this is for 8 VMs with 3 vcpus each; if we can instead go for 4 VMs
with 3 real cores each, then we need less RAM (~ $1000 less)
=> depends on the outcome of [[!tails_ticket 10971]]
* 1 x Super X10DRi, 2x GB/i350 LAN, 10x SATA3(C612)+R, IPMI, DDR4(1TB) - $390
* 2 x Intel® E5-2643v3, 6C, 3.4GHz, 135 - $3260
* 16 x 16GB D4-2133Mhz, ECC/Reg 288-Pin Sdram - $2100
* 2 x Samsung 850 EVO, 500GB 2.5" SATA3 SSD(3D V-NAMD) - $400
* 1 x Heatsink - $50
* 1 x Supermicro SC113TQ-600W, 1U RM, WIO, 8x 2.5" SAS/SATA 600W - $350
Total --- **$6675**
## Deprecated options
### Option A: Low voltage CPUs
We actually need less CPU cores.
That's essentially a Lizard clone, minus SSD HDDs.
......@@ -57,7 +99,7 @@ That's essentially a Lizard clone, minus SSD HDDs.
Total --- **$6200**
## Option B: Faster CPUs
### Option B: Faster CPUs
* 1 x Super X10DRi, 2x GB/i350 LAN, 10x SATA3(C612)+R, IPMI, DDR4(1TB) - $390
* 2 x Intel® E5-2670v3-2.3Ghz/12C, 30M, 9.6GT/s, 120W LGA2011 CPU - $3,300
......
......@@ -318,6 +318,61 @@ Genera il wiki in locale su TAILS
cd mytails
./build-website --set destdir="/home/amnesia/Persistent/outtails" "$@"
___
# Documenti Revisionati
Dancus
./doc/first_steps/persistence/warninzeyev REVISIONATO
./doc/first_steps/shutdown REVISIONATO
./doc/first_steps/start_tails REVISIONATO
./doc/first_steps/startup_option/administration_password
./doc/first_steps/startup_options/bridge_mode
./doc/first_steps/startup_options/mac_spoofing
./doc/first_steps/startup_options/network_configuration
./doc/first_steps/startup_options/windows_camouflage
-------------------------------------------------------------------
Blackflag
doc/about/tor.it.html REVISIONATO ("Tor ama le compagnie?")
about/trust.it.po (il file è ok ma sul sito locale sembra ancora da tradurre...)
about/warning.it.po (manca circa 1/3 della traduzione)
doc/first_steps/shutdown.it.po REVISIONATO
getting_started.it.po REVISIONATO
index.it.po REVISIONATO
sidebar.it.po REVISIONATO
support.it.html REVISIONATO (file ok ma html sbagliato (da me) )
________________________________
Igni
./doc/about.index --FINITO!
./doc/about/features --FINITO!
./doc/about/fingerprint --FINITO!
./doc/first_steps/persistence.caution --FINITO!
./doc/first_steps/persistence/configure --FINITO!
./doc/first_steps/persistence/delete --FINITO!
./doc/first_steps/persistence/warnings --FINITO!
________________________________________
......@@ -7,6 +7,12 @@ The document can also list candidate clients together with some indication where
TODO: Would a pair of two separate client (XMPP and IRC) also be okay, or are we only looking for a single client that can do both?
# Requirements
**Note**: the key words "MUST", "MUST NOT", "REQUIRED", "SHALL",
"SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and
"OPTIONAL" in this document are to be interpreted as described in
[RFC 2119](http://www.ietf.org/rfc/rfc2119.txt).
## General requirements
### Documentation
......@@ -39,13 +45,28 @@ Ideally, some usability study for the OTR user interface has been done.
TODO: Pidgin already has an apparmor profile; should we require that a replacement also comes with an apparmor profile?
The client MUST NOT save logs of conversations.
## XMPP (Jabber)
*( Here is a [list](https://developer.pidgin.im/wiki/SupportedXEPs) of XMPP extensions supported by Pidgin )*
### MUC
The client must support XMPP conference rooms [(XEP-0045)](https://xmpp.org/extensions/xep-0045.html).
## IRC
### SASL
The client must support SASL authentication.
# Candidate alternatives
## Tor Messenger
## Tor Messenger ([[!tails_ticket 8577]])
* Documentation, downloads and tickets in Tor's [Trac](https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger)
* Tor Messenger supports XMPP, IRC and some other protocols.
## CoyIM (based on xmpp-client) ([[!tails_ticket 8574]])
## xmpp-client
* [Homepage](https://coy.im/)
* [Github](https://github.com/twstrike/coyim/)
* CoyIM only supports XMPP.
......@@ -48,6 +48,28 @@ We recommend you to [[build an offline version of the
documentation|contribute/build/website]] to test your contributions
before sharing them with us.
# Tools
- Images on our website are compressed and cleaned using the
[[compress-image.sh]] script. To run this script you need the
`optipng`, `advancecomp`, and `mat` packages.
- To encode and decode QR codes, you can use the [[qrcode-encode.sh]]
and [[qrcode-decode.sh]] scripts. To run these scripts
you need to install the `qrencode` and `zbar-tools` packages.
For example:
qrcode-encode https://tails.boum.org/
Creates a QR code in tails_boum_org.png. And:
qrcode-decode tails_boum_org.png
Outputs:
QR-Code:https://tails.boum.org/
# Translating
We want Tails [[end-user documentation|doc]] to be translated in
......
#!/bin/bash
# To run this script in Debian, install the packages 'optipng' and 'advancecomp'.
set -e
set -u
for image in $* ; do
optipng -o6 $image
advdef -z3 $image
if [ ! -x /usr/bin/optipng ]; then
echo "Please install the \"optipng\" package." >&2
exit 1
fi
if [ ! -x /usr/bin/advdef ]; then
echo "Please install the \"advancecomp\" package." >&2
exit 1
fi
if [ ! -x /usr/bin/mat ]; then
echo "Please install the \"mat\" package." >&2
exit 1
fi
for image in "${@}" ; do
optipng -o6 "${image}"
advdef -z3 "${image}"
mat "${image}"
done
#!/bin/bash
set -e
set -u
if [ ! -x /usr/bin/zbarimg ]; then
echo "Please install the \"zbar-tools\" package." >&2
exit 1
fi
for code in "${@}" ; do
echo "${code}"
zbarimg "${code}"
done
#!/bin/bash
set -e
set -u
if [ ! -x /usr/bin/qrencode ]; then
echo "Please install the \"qrencode\" package." >&2
exit 1
fi
for code in "${@}" ; do
file="$(echo "${code}" | sed -r "s#http(s)?://##;s#/\$##;s#[/\.]#_#g")"
qrencode -o "${file}.png" -s 5 "${code}"
"$(dirname "${0}")/compress-image.sh" "${file}.png"
done
......@@ -791,7 +791,7 @@ Update the size of the ISO image in `inc/*`:
Generate the expected signature verification output:
gpg --keyid-format long --verify "${ISO_PATH}.sig" "${ISO_PATH}" 2>&1 | \
gpg --keyid-format 0xlong --verify "${ISO_PATH}.sig" "${ISO_PATH}" 2>&1 | \
sed 's/ /\&nbsp;/g;s/</\&lt;/;s/>/\&gt;/;s/$/<br\/>/g' > \
"$RELEASE_CHECKOUT/wiki/src/inc/stable_i386_gpg_signature_output.html"
......
......@@ -224,3 +224,21 @@ Example for a backport to Jessie:
* build, test and upload to jessie-backports
* have gbp create a `debian/4.3+dfsg-1_bpo8+1` tag
* push the Debian packaging branch (`debian/jessie-backports`) and the new tag
### Quality assurance
Scenario: Installing Tails to a pristine USB drive
Given I have started Debian
And I have a Tails ISO image
When I install the tails-installer package
And I plug USB drive "install"
And I ask Tails Installer to install my Tails ISO image to USB drive "install"
Then my Tails ISO image is installed on USB drive "install"
Scenario: Upgrading an old Tails USB installation from an ISO image
Given I have started Debian
And I have a Tails ISO image
When I install the tails-installer package
And I plug USB drive "upgrade" that has an old Tails installed
And I ask Tails installer to upgrade USB drive "upgrade" with my Tails ISO image
Then my Tails ISO image is installed on USB drive "upgrade"
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails Translation\n"
"POT-Creation-Date: 2015-10-30 11:35+0100\n"
"POT-Creation-Date: 2016-01-21 20:21+0100\n"
"PO-Revision-Date: 2015-05-16 22:27+0100\n"
"Last-Translator: spriver <spriver@autistici.org>\n"
"Language-Team: Tails Translation <tails-l10n@boum.org>\n"
......@@ -60,7 +60,31 @@ msgstr ""
"lizenz- oder markenrechtlich geschützt sind:"
#. type: Plain text
#, no-wrap
#, fuzzy, no-wrap
#| msgid ""
#| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
#| " by Ilsur Aptukov from the Noun Project.\n"
#| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
#| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
#| "project is authorized to use it under certain conditions; licensed under\n"
#| "Creative Commons Attribution 3.0 United States License.\n"
#| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
#| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
#| " Creative Commons - Attribution, by Olivier Guin.\n"
#| " - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
#| " Attribution, by Azis.\n"
#| " - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
#| " Attribution, by factor[e] design initiative.\n"
#| " - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by\n"
#| " Rohith M S.\n"
#| " - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
#| " Attribution, by Edward Boatman.\n"
#| " - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
#| " Commons — Attribution, by Joe Mortell.\n"
#| " - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
#| " Attribution, by Cris Dobbins.\n"
#| " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
#| " Creative Commons — Attribution, by Cornelius Danger.\n"
msgid ""
" - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
" by Ilsur Aptukov from the Noun Project.\n"
......@@ -71,20 +95,28 @@ msgid ""
" - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
" Creative Commons - Attribution, by Olivier Guin.\n"
" - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
" Attribution, by Azis.\n"
" - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
" Attribution, by factor[e] design initiative.\n"
" - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by\n"
" Rohith M S.\n"
" - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
" Attribution, by Edward Boatman.\n"
" - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
" Commons — Attribution, by Joe Mortell.\n"
" - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
" Attribution, by Cris Dobbins.\n"
" - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
" Creative Commons — Attribution, by Azis.\n"
" - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
" Creative Commons — Attribution, by factor[e] design initiative.\n"
" - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
" Public Domain, by Rohith M S.\n"
" - [[User|http://thenounproject.com/term/user/419/]]:\n"
" Creative Commons — Attribution, by Edward Boatman.\n"
" - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
" Creative Commons — Attribution, by Joe Mortell.\n"
" - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
" Creative Commons — Attribution, by Cris Dobbins.\n"
" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
" Creative Commons — Attribution, by Cornelius Danger.\n"
" - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
" Public Domain, by Julian Norton.\n"
" - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
" Creative Commons — Attribution, by Kervin Markle.\n"
" - [[Play|https://thenounproject.com/term/play/152052]]:\n"
" Creative Commons — Attribution, by Zech Nelson.\n"
" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
" Creative Commons — Attribution, by Zech Nelson.\n"
msgstr ""
" - Das Tails-Logo basiert auf [[USB|http://thenounproject.com/term/usb/23873/]]\n"
" von Ilsur Aptukov von The Noun Project.\n"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2015-12-24 15:03+0100\n"
"POT-Creation-Date: 2016-01-21 20:21+0100\n"
"PO-Revision-Date: 2015-10-21 10:59+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/license/"
......@@ -62,7 +62,31 @@ msgstr ""
"و شرایط توزیع گوناگونی هستند:"
#. type: Plain text
#, no-wrap
#, fuzzy, no-wrap
#| msgid ""
#| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
#| " by Ilsur Aptukov from the Noun Project.\n"
#| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
#| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
#| "project is authorized to use it under certain conditions; licensed under\n"
#| "Creative Commons Attribution 3.0 United States License.\n"
#| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
#| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
#| " Creative Commons - Attribution, by Olivier Guin.\n"
#| " - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
#| " Attribution, by Azis.\n"
#| " - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
#| " Attribution, by factor[e] design initiative.\n"
#| " - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by\n"
#| " Rohith M S.\n"
#| " - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
#| " Attribution, by Edward Boatman.\n"
#| " - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
#| " Commons — Attribution, by Joe Mortell.\n"
#| " - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
#| " Attribution, by Cris Dobbins.\n"
#| " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
#| " Creative Commons — Attribution, by Cornelius Danger.\n"
msgid ""
" - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
" by Ilsur Aptukov from the Noun Project.\n"
......@@ -73,20 +97,28 @@ msgid ""
" - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
" Creative Commons - Attribution, by Olivier Guin.\n"
" - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
" Attribution, by Azis.\n"
" - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
" Attribution, by factor[e] design initiative.\n"
" - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by\n"
" Rohith M S.\n"
" - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
" Attribution, by Edward Boatman.\n"
" - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
" Commons — Attribution, by Joe Mortell.\n"
" - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
" Attribution, by Cris Dobbins.\n"
" - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
" Creative Commons — Attribution, by Azis.\n"
" - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
" Creative Commons — Attribution, by factor[e] design initiative.\n"
" - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
" Public Domain, by Rohith M S.\n"
" - [[User|http://thenounproject.com/term/user/419/]]:\n"
" Creative Commons — Attribution, by Edward Boatman.\n"
" - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
" Creative Commons — Attribution, by Joe Mortell.\n"
" - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
" Creative Commons — Attribution, by Cris Dobbins.\n"
" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
" Creative Commons — Attribution, by Cornelius Danger.\n"
" - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
" Public Domain, by Julian Norton.\n"
" - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
" Creative Commons — Attribution, by Kervin Markle.\n"
" - [[Play|https://thenounproject.com/term/play/152052]]:\n"
" Creative Commons — Attribution, by Zech Nelson.\n"
" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
" Creative Commons — Attribution, by Zech Nelson.\n"
msgstr ""
" - نشان‌وارهٔ تیلز بر اساس [[USB|http://thenounproject.com/term/usb/23873/]]\n"
" و توسط ایلسور آبتوکف از پروژهٔ Noun طراحی شده‌است.\n"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-10-30 11:35+0100\n"
"POT-Creation-Date: 2016-01-21 20:21+0100\n"
"PO-Revision-Date: 2012-04-29 16:02+0100\n"
"Last-Translator: MR\n"
"Language-Team: \n"
......@@ -63,20 +63,28 @@ msgid ""
" - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
" Creative Commons - Attribution, by Olivier Guin.\n"
" - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
" Attribution, by Azis.\n"
" - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
" Attribution, by factor[e] design initiative.\n"
" - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by\n"
" Rohith M S.\n"
" - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
" Attribution, by Edward Boatman.\n"
" - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
" Commons — Attribution, by Joe Mortell.\n"
" - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
" Attribution, by Cris Dobbins.\n"
" - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
" Creative Commons — Attribution, by Azis.\n"
" - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
" Creative Commons — Attribution, by factor[e] design initiative.\n"
" - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
" Public Domain, by Rohith M S.\n"
" - [[User|http://thenounproject.com/term/user/419/]]:\n"
" Creative Commons — Attribution, by Edward Boatman.\n"
" - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
" Creative Commons — Attribution, by Joe Mortell.\n"
" - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
" Creative Commons — Attribution, by Cris Dobbins.\n"
" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
" Creative Commons — Attribution, by Cornelius Danger.\n"
" - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
" Public Domain, by Julian Norton.\n"
" - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
" Creative Commons — Attribution, by Kervin Markle.\n"
" - [[Play|https://thenounproject.com/term/play/152052]]:\n"
" Creative Commons — Attribution, by Zech Nelson.\n"
" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
" Creative Commons — Attribution, by Zech Nelson.\n"
msgstr ""
#. type: Title =
......
......@@ -21,20 +21,28 @@ Creative Commons Attribution 3.0 United States License.
- Icons from [[The Noun Project|http://thenounproject.com/]]:
- [[Announcement|http://thenounproject.com/term/announcement/1186/]]:
Creative Commons - Attribution, by Olivier Guin.
- [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —
Attribution, by Azis.
- [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —
Attribution, by factor[e] design initiative.
- [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by
Rohith M S.
- [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —
Attribution, by Edward Boatman.
- [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative
Commons — Attribution, by Joe Mortell.
- [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —
Attribution, by Cris Dobbins.
- [[Code|http://thenounproject.com/term/code/18033/]]:
Creative Commons — Attribution, by Azis.
- [[Pen|http://thenounproject.com/term/pen/18907/]]:
Creative Commons — Attribution, by factor[e] design initiative.
- [[Loan|http://thenounproject.com/term/loan/19538/]]:
Public Domain, by Rohith M S.
- [[User|http://thenounproject.com/term/user/419/]]:
Creative Commons — Attribution, by Edward Boatman.
- [[Translation|http://thenounproject.com/term/translation/5735/]]:
Creative Commons — Attribution, by Joe Mortell.
- [[Gears|http://thenounproject.com/term/gears/8949/]]:
Creative Commons — Attribution, by Cris Dobbins.
- [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:
Creative Commons — Attribution, by Cornelius Danger.
- [[Check Mark|https://thenounproject.com/term/check/4489/]]:
Public Domain, by Julian Norton.
- [[Delete|https://thenounproject.com/term/delete/49691/]]:
Creative Commons — Attribution, by Kervin Markle.
- [[Play|https://thenounproject.com/term/play/152052]]:
Creative Commons — Attribution, by Zech Nelson.
- [[Pause|https://thenounproject.com/term/pause/152046]]:
Creative Commons — Attribution, by Zech Nelson.
Distribution of the source code
===============================
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-10-30 11:35+0100\n"
"POT-Creation-Date: 2016-01-21 20:21+0100\n"
"PO-Revision-Date: 2014-05-23 12:05-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -52,7 +52,31 @@ msgstr ""
"marcas e termos de distribuição:"
#. type: Plain text
#, no-wrap
#, fuzzy, no-wrap
#| msgid ""
#| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
#| " by Ilsur Aptukov from the Noun Project.\n"
#| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
#| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
#| "project is authorized to use it under certain conditions; licensed under\n"
#| "Creative Commons Attribution 3.0 United States License.\n"
#| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
#| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
#| " Creative Commons - Attribution, by Olivier Guin.\n"
#| " - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
#| " Attribution, by Azis.\n"
#| " - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
#| " Attribution, by factor[e] design initiative.\n"
#| " - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by\n"
#| " Rohith M S.\n"
#| " - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
#| " Attribution, by Edward Boatman.\n"
#| " - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"