Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
tails
tails
Commits
2685a0a2
Commit
2685a0a2
authored
Jul 05, 2017
by
intrigeri
Browse files
Merge remote-tracking branch 'origin/master' into doc/12629-reproducible-release-process
parent
2ca22f37
Changes
401
Hide whitespace changes
Inline
Side-by-side
bin/delete-merged-git-branches
View file @
2685a0a2
...
...
@@ -7,7 +7,8 @@ import sys
from
distutils.util
import
strtobool
from
tailslib.git
import
Git
### Functions
# Functions
def
yes_no_input
(
prompt
,
default
=
True
):
if
default
:
...
...
@@ -25,7 +26,8 @@ def yes_no_input(prompt, default=True):
except
ValueError
:
print
(
"Please respond with 'y' or 'n'."
)
### Parse command-line arguments
# Parse command-line arguments
parser
=
argparse
.
ArgumentParser
(
description
=
'Delete merged Git branches.'
)
parser
.
add_argument
(
'--repo'
,
type
=
str
,
dest
=
'repo'
,
...
...
@@ -37,7 +39,8 @@ parser.add_argument('--batch', type=bool, dest='batch',
help
=
'Assume "yes" as answer to all prompts.'
)
args
=
parser
.
parse_args
()
### Main
# Main
pp
=
pprint
.
PrettyPrinter
()
tailsgit
=
Git
(
args
.
repo
)
...
...
@@ -48,8 +51,9 @@ if not branches_to_delete:
sys
.
exit
(
0
)
print
(
"The following branches will be deleted:"
)
pp
.
pprint
(
branches_to_delete
)
if
not
args
.
batch
and
not
yes_no_input
(
"Remove these branches?"
,
default
=
False
):
pp
.
pprint
(
sorted
(
branches_to_delete
))
if
not
args
.
batch
\
and
not
yes_no_input
(
"Remove these branches?"
,
default
=
False
):
sys
.
exit
(
0
)
tailsgit
.
push
(
args
.
remote
,
[
':%s'
%
branch
for
branch
in
branches_to_delete
])
config/chroot_local-includes/usr/share/amnesia/build/mksquashfs-excludes
View file @
2685a0a2
...
...
@@ -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
...
...
config/chroot_local-includes/usr/share/doc/amnesia/README.eCAFE
deleted
100644 → 0
View file @
2ca22f37
-
*- 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`
config/chroot_local-includes/usr/share/doc/amnesia/examples/eCAFE/X11_fixup
deleted
100755 → 0
View file @
2ca22f37
#!/bin/sh
if
[
!
-d
/etc/X11
]
;
then
mkdir
/etc/X11
chmod
755 /etc/X11
fi
ln
-s
--force
/usr/bin/Xorg /etc/X11/X
config/chroot_local-includes/usr/share/doc/amnesia/examples/eCAFE/xorg.conf
deleted
100644 → 0
View file @
2ca22f37
# 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
config/chroot_local-includes/usr/share/icons/tails-system-shutdown.png
deleted
100644 → 0
View file @
2ca22f37
1.29 KB
ikiwiki-cgi.setup
View file @
2685a0a2
...
...
@@ -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
...
...
ikiwiki.setup
View file @
2685a0a2
...
...
@@ -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
...
...
pythonlib
@
9906322f
Subproject commit
e65c7b2f72f46e5eae19a4e5a308816b435d2ad7
Subproject commit
9906322f76c0f323bc99090905c31add47cacced
wiki/src/about.de.po
View file @
2685a0a2
...
...
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails i10n Team\n"
"POT-Creation-Date: 2017-0
2
-2
5 15
:2
4
+0
1
00\n"
"POT-Creation-Date: 2017-0
6
-2
7 08
:2
9
+0
3
00\n"
"PO-Revision-Date: 2016-05-30 16:00-0000\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails-l10n@boum.org>\n"
...
...
@@ -63,7 +63,8 @@ msgstr ""
"Tails ist ein vollständiges Betriebssystem, das direkt von einer DVD, einem "
"USB-Stick oder einer SD-Karte aus genutzt wird, unabhängig von dem auf dem "
"Computer installierten Betriebssystem. Tails ist [[Freie Software|doc/about/"
"license]] und basiert auf [[Debian GNU/Linux|https://www.debian.org/]]."
"license]] und basiert auf [[Debian GNU/Linux|https://www.debian.org/index.de."
"html]]."
#. type: Plain text
msgid ""
...
...
@@ -288,13 +289,14 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"[[Encrypt your USB sticks or external hard-disks|doc/encryption_and_privacy/"
"encrypted_volumes]] using <span class=\"definition\">[[!wikipedia LUKS]]</"
"span>, the Linux standard for disk-encryption."
"encrypted_volumes]] using <span class=\"definition\">[[!wikipedia "
"Linux_Unified_Key_Setup desc=\"LUKS\"]]</span>, the Linux standard for disk-"
"encryption."
msgstr ""
"[[Verschlüsseln Sie Ihren USB-Stick oder externe Festplatten|doc/"
"encryption_and_privacy/encrypted_volumes]] mit <span class=\"definition\">[[!"
"wikipedia_de
Linux_Unified_Key_Setup
#Erweiterung_mit_LUKS desc=\"LUKS\"]]</"
"
span>, dem Linux-
Standardprogramm zur Festplattenverschlüsselung."
"wikipedia_de
Dm-crypt
#Erweiterung_mit_LUKS desc=\"LUKS\"]]</
span>, dem Linux-
"
"Standardprogramm zur Festplattenverschlüsselung."
#. type: Bullet: ' - '
msgid ""
...
...
@@ -312,8 +314,9 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"Encrypt and sign your emails and documents using the *de facto* standard "
"<span class=\"definition\">[[!wikipedia OpenPGP]]</span> either from Tails "
"email client, text editor or file browser."
"<span class=\"definition\">[[!wikipedia Pretty_Good_Privacy#OpenPGP desc="
"\"OpenPGP\"]]</span> either from Tails email client, text editor or file "
"browser."
msgstr ""
"Verschlüsseln und signieren Sie Dokumente und E-Mails mit dem *de facto* "
"Standard <span class=\"definition\">[[!wikipedia_de OpenPGP]]</span>, "
...
...
@@ -418,6 +421,17 @@ msgstr "Presse und Medien\n"
msgid "See [[Press and media information|press]]."
msgstr "Lesen Sie die [[Medien- und Presseinformationen|press]]."
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Contact\n"
msgid "Social Contract\n"
msgstr "Kontakt\n"
#. type: Plain text
msgid ""
"Read our [[Social Contract|contribute/working_together/social_contract]]."
msgstr ""
#. type: Title =
#, no-wrap
msgid "Acknowledgments and similar projects\n"
...
...
wiki/src/about.fa.po
View file @
2685a0a2
...
...
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2017-0
2
-2
5 15
:2
4
+0
1
00\n"
"POT-Creation-Date: 2017-0
6
-2
7 08
:2
9
+0
3
00\n"
"PO-Revision-Date: 2015-10-21 10:58+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/about/fa/"
...
...
@@ -63,7 +63,8 @@ msgid ""
msgstr ""
"این سیستم عامل، مستقل از سیستم عامل اولیهٔ رایانه طراحی شده و با دیویدی، "
"درایو یواسبی، و کارت اسدی قابل استفاده است. تیلز یک [[نرمافزار آزاد|doc/"
"about/license]] و مبتنی بر [[دبیان گنو/لینوکس|https://www.debian.org/]] است."
"about/license]] و مبتنی بر [[دبیان گنو/لینوکس|https://www.debian.org/index."
"fa.html]] است."
#. type: Plain text
msgid ""
...
...
@@ -315,12 +316,14 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"[[Encrypt your USB sticks or external hard-disks|doc/encryption_and_privacy/"
"encrypted_volumes]] using <span class=\"definition\">[[!wikipedia LUKS]]</"
"span>, the Linux standard for disk-encryption."
"encrypted_volumes]] using <span class=\"definition\">[[!wikipedia "
"Linux_Unified_Key_Setup desc=\"LUKS\"]]</span>, the Linux standard for disk-"
"encryption."
msgstr ""
"با استفاده از <span class=\"definition\">[[!wikipedia LUKS]]</span> یعنی "
"استاندارد لینوکس برای رمزنگاری دیسکها، [[درایوهای یواسبی یا سختدیسکهای خارجی "
"خود را رمزگذاری کنید|doc/encryption_and_privacy/encrypted_volumes]]."
"با استفاده از <span class=\"definition\">[[!wikipedia "
"Linux_Unified_Key_Setup desc=\"LUKS\"]]</span> یعنی استاندارد لینوکس برای "
"رمزنگاری دیسکها، [[درایوهای یواسبی یا سختدیسکهای خارجی خود را رمزگذاری کنید|"
"doc/encryption_and_privacy/encrypted_volumes]]."
#. type: Bullet: ' - '
#, fuzzy
...
...
@@ -343,13 +346,14 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"Encrypt and sign your emails and documents using the *de facto* standard "
"<span class=\"definition\">[[!wikipedia OpenPGP]]</span> either from Tails "
"email client, text editor or file browser."
"<span class=\"definition\">[[!wikipedia Pretty_Good_Privacy#OpenPGP desc="
"\"OpenPGP\"]]</span> either from Tails email client, text editor or file "
"browser."
msgstr ""
"رایانامهها و مستندات خود را با استفاده از استاندارد *غیررسمی (دفاکتو)* <span "
"class=\"definition\">[[!wikipedia
OpenPGP]]</span> رمزگذاری کنید. برای این
"
"کار میتوانید از سرویس رایانامه، ویرایشگر
متن و یا مرورگر فایل تیلز استفاده
"
"کنید."
"class=\"definition\">[[!wikipedia
Pretty_Good_Privacy#OpenPGP desc=\"OpenPGP
"
"
\"]]</span> رمزگذاری کنید. برای این
کار میتوانید از سرویس رایانامه، ویرایشگر "
"
متن و یا مرورگر فایل تیلز استفاده
کنید."
#. type: Bullet: ' - '
msgid ""
...
...
@@ -453,6 +457,16 @@ msgstr "رسانهها و خبرگزاریها\n"
msgid "See [[Press and media information|press]]."
msgstr "[[اطلاعات رسانهها و خبرگزاریها|press]] را ببینید."
#. type: Title =
#, no-wrap
msgid "Social Contract\n"
msgstr ""
#. type: Plain text
msgid ""
"Read our [[Social Contract|contribute/working_together/social_contract]]."
msgstr ""
#. type: Title =
#, no-wrap
msgid "Acknowledgments and similar projects\n"
...
...
wiki/src/about.fr.po
View file @
2685a0a2
...
...
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2017-0
2
-2
5 15
:2
4
+0
1
00\n"
"PO-Revision-Date: 201
6
-06-
0
5
09:23-
0000\n"
"POT-Creation-Date: 2017-0
6
-2
7 08
:2
9
+0
3
00\n"
"PO-Revision-Date: 201
7
-06-
2
5
10:13+
0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.
6
.1
0
\n"
"X-Generator: Poedit 1.
8
.1
1
\n"
#. type: Plain text
#, no-wrap
...
...
@@ -62,7 +62,7 @@ msgstr ""
"Tails est un système d'exploitation complet destiné à être utilisé depuis un "
"DVD, une clef USB ou une carte SD indépendamment du système installé sur "
"l'ordinateur. C'est un [[logiciel libre|doc/about/license]] basé sur "
"[[Debian GNU/Linux|https://www.debian.org/]]."
"[[Debian GNU/Linux|https://www.debian.org/
index.fr.html
]]."
#. type: Plain text
msgid ""
...
...
@@ -285,12 +285,13 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"[[Encrypt your USB sticks or external hard-disks|doc/encryption_and_privacy/"
"encrypted_volumes]] using <span class=\"definition\">[[!wikipedia LUKS]]</"
"span>, the Linux standard for disk-encryption."
"encrypted_volumes]] using <span class=\"definition\">[[!wikipedia "
"Linux_Unified_Key_Setup desc=\"LUKS\"]]</span>, the Linux standard for disk-"
"encryption."
msgstr ""
"[[Chiffrez votre clé USB ou votre disque dur externe|doc/"
"encryption_and_privacy/encrypted_volumes]] avec <span class=\"definition"
"
\">
[[!wikipedia_fr LUKS]]</span>, le standard de Linux en matière de "
"encryption_and_privacy/encrypted_volumes]] avec <span class=\"definition
\">
"
"[[!wikipedia_fr LUKS]]</span>, le standard de Linux en matière de "
"chiffrement de volume."
#. type: Bullet: ' - '
...
...
@@ -308,8 +309,9 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"Encrypt and sign your emails and documents using the *de facto* standard "
"<span class=\"definition\">[[!wikipedia OpenPGP]]</span> either from Tails "
"email client, text editor or file browser."
"<span class=\"definition\">[[!wikipedia Pretty_Good_Privacy#OpenPGP desc="
"\"OpenPGP\"]]</span> either from Tails email client, text editor or file "
"browser."
msgstr ""
"Chiffrez et signez vos emails et documents depuis le client mail de Tails, "
"l'éditeur de texte ou le navigateur de fichiers grâce au standard *de facto* "
...
...
@@ -322,9 +324,9 @@ msgid ""
"cryptographic tool that provides encryption, authentication and deniability."
msgstr ""
"Protégez vos conversations par messagerie instantanée en utilisant <span "
"class=\"definition\">[[!wikipedia_fr Off-the-Record Messaging desc=\"OTR"
"
\"]]
</span>, un outil cryptographique qui fournit chiffrement, "
"
authentification
ainsi que la possibilité du déni plausible."
"class=\"definition\">[[!wikipedia_fr Off-the-Record Messaging desc=\"OTR
\"]]
"
"</span>, un outil cryptographique qui fournit chiffrement,
authentification
"
"ainsi que la possibilité du déni plausible."
#. type: Bullet: ' - '
msgid ""
...
...
@@ -411,6 +413,16 @@ msgstr "Presse et médias\n"
msgid "See [[Press and media information|press]]."
msgstr "Voir [[la rubrique presse et médias|press]]."
#. type: Title =
#, no-wrap
msgid "Social Contract\n"
msgstr "Contrat social\n"
#. type: Plain text
msgid ""
"Read our [[Social Contract|contribute/working_together/social_contract]]."
msgstr "Lisez notre [[contrat social|news/social_contract]]"
#. type: Title =
#, no-wrap
msgid "Acknowledgments and similar projects\n"
...
...
wiki/src/about.it.po
View file @
2685a0a2
...
...
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 1\n"
"POT-Creation-Date: 2017-0
2
-2
5 15
:2
4
+0
1
00\n"
"POT-Creation-Date: 2017-0
6
-2
7 08
:2
9
+0
3
00\n"
"PO-Revision-Date: 2016-06-11 18:33+0100\n"
"Last-Translator: Zeyev <zeyev@autistici.org>\n"
"Language-Team: ita <transitails@inventati.org>\n"
...
...
@@ -63,7 +63,8 @@ msgstr ""
"É un Sistema Operativo completo progettato per essere avviato da DVD, "
"memoria USB o scheda SD e funziona indipendentemente dal sistema operativo "
"originale installato sul computer. É un [[Software Libero|doc/about/"
"license]] basato su [[Debian GNU/Linux|https://www.debian.org/]]."
"license]] basato su [[Debian GNU/Linux|https://www.debian.org/index.it."
"html]]."
#. type: Plain text
msgid ""
...
...
@@ -285,13 +286,14 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"[[Encrypt your USB sticks or external hard-disks|doc/encryption_and_privacy/"
"encrypted_volumes]] using <span class=\"definition\">[[!wikipedia LUKS]]</"
"span>, the Linux standard for disk-encryption."
"encrypted_volumes]] using <span class=\"definition\">[[!wikipedia "
"Linux_Unified_Key_Setup desc=\"LUKS\"]]</span>, the Linux standard for disk-"
"encryption."
msgstr ""
"[[Criptare una memoria USB o un disco fisso esterno|doc/"
"encryption_and_privacy/encrypted_volumes]] usando <span class=\"definition"
"
\">
[[!wikipedia
LUKS]]</span>, lo strumento standard per criptare un disc
o "
"su Gnu-Linux."
"encryption_and_privacy/encrypted_volumes]] usando <span class=\"definition
\">
"
"[[!wikipedia
_it Linux_Unified_Key_Setup desc=\"LUKS\"]]</span>, lo strument
o "
"
standard per criptare un disco
su Gnu-Linux."
#. type: Bullet: ' - '
msgid ""
...
...
@@ -308,13 +310,14 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"Encrypt and sign your emails and documents using the *de facto* standard "
"<span class=\"definition\">[[!wikipedia OpenPGP]]</span> either from Tails "
"email client, text editor or file browser."
"<span class=\"definition\">[[!wikipedia Pretty_Good_Privacy#OpenPGP desc="
"\"OpenPGP\"]]</span> either from Tails email client, text editor or file "
"browser."
msgstr ""
"Cripta e firma le tue email e documenti usando lo standard riconosciuto "
"<span class=\"definition\">[[!wikipedia
_en
Pretty_Good_Privacy
desc=\"
OpenPGP"
"\"]]</span>, entrambe le cose dal client emails di Tails,
dall'editor di
"
"testo o dal gestore dei file."
"<span class=\"definition\">[[!wikipedia Pretty_Good_Privacy
#
OpenPGP
desc=
"
"\"
OpenPGP\"
]]</span>, entrambe le cose dal client emails di Tails, "
"
dall'editor di
testo o dal gestore dei file."
#. type: Bullet: ' - '
msgid ""
...
...
@@ -323,7 +326,7 @@ msgid ""
"cryptographic tool that provides encryption, authentication and deniability."
msgstr ""
"Proteggi le tue conversazioni online con <span class=\"definition\">[[!"
"wikipedia Off-the-Record
_
Messaging desc=\"OTR\"]]</span> (Off-the-Record "
"wikipedia
_it
Off-the-Record
Messaging desc=\"OTR\"]]</span> (Off-the-Record "
"Messaging, pagina in inglese), uno strumento crittografico per la cifratura, "
"l'autenticazione e la plausibile smentita."
...
...
@@ -374,8 +377,8 @@ msgstr ""
msgid ""
"our [[installation instructions|install]] to download and install Tails,"
msgstr ""
"le nostre [[istruzioni per l'installazione|install]] per scaricare e
installare
"
"Tails,"
"le nostre [[istruzioni per l'installazione|install]] per scaricare e "
"
installare
Tails,"
#. type: Bullet: ' - '
msgid "our [[documentation|doc]] explaining in detail how to use Tails,"
...
...
@@ -409,7 +412,18 @@ msgstr "Stampa ed altri media\n"
#. type: Plain text
msgid "See [[Press and media information|press]]."
msgstr "Guarda [[informazioni dalla stampa e dai media|press]."
msgstr "Guarda [[informazioni dalla stampa e dai media|press]]."
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Contact\n"
msgid "Social Contract\n"
msgstr "Contatti\n"
#. type: Plain text
msgid ""
"Read our [[Social Contract|contribute/working_together/social_contract]]."
msgstr ""
#. type: Title =
#, no-wrap
...
...
wiki/src/about.mdwn
View file @
2685a0a2
...
...
@@ -97,8 +97,8 @@ encryption:
- [[Encrypt your USB sticks or external
hard-disks|doc/encryption_and_privacy/encrypted_volumes]] using <span
class="definition">[[!wikipedia L
UKS]]</span>, the Linux standard for
disk-encryption.
class="definition">[[!wikipedia L
inux_Unified_Key_Setup desc="LUKS"]]</span>,
the Linux standard for
disk-encryption.
- Automatically use HTTPS to encrypt all your communications to a number of
major websites using [HTTPS
...
...
@@ -106,8 +106,8 @@ encryption:
developed by the [Electronic Frontier Foundation](https://www.eff.org).
- Encrypt and sign your emails and documents using the *de facto* standard
<span class="definition">[[!wikipedia
OpenPGP]]</span> either from Tails
email client, text editor or file browser.
<span class="definition">[[!wikipedia
Pretty_Good_Privacy#OpenPGP desc="OpenPGP"]]</span>
either from Tails
email client, text editor or file browser.
- Protect your instant messaging conversations using <span
class="definition">[[!wikipedia Off-the-Record_Messaging
...
...
@@ -138,6 +138,11 @@ Press and media
See [[Press and media information|press]].
Social Contract
===============
Read our [[Social Contract|contribute/working_together/social_contract]].
Acknowledgments and similar projects
====================================
...
...
wiki/src/about.pt.po
View file @
2685a0a2
...
...
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 1\n"
"POT-Creation-Date: 2017-0
2
-2
5 15
:2
4
+0
1
00\n"
"POT-Creation-Date: 2017-0
6
-2
7 08
:2
9
+0
3
00\n"
"PO-Revision-Date: 2016-03-28 09:14-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: Portuguese <LL@li.org>\n"
...
...
@@ -63,7 +63,8 @@ msgstr ""
"É um Sistema Operacional completo projetado para ser usado a partir de um "
"DVD, memória USB ou cartão SD e funciona de forma independente do sistema "
"operacional original do computador. É um [[Software Livre|doc/about/"
"license]] baseado no [[Debian GNU/Linux|https://www.debian.org/]]."
"license]] baseado no [[Debian GNU/Linux|https://www.debian.org/index.pt."
"html]]."
#. type: Plain text
msgid ""
...
...
@@ -282,13 +283,14 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"[[Encrypt your USB sticks or external hard-disks|doc/encryption_and_privacy/"
"encrypted_volumes]] using <span class=\"definition\">[[!wikipedia LUKS]]</"
"span>, the Linux standard for disk-encryption."
"encrypted_volumes]] using <span class=\"definition\">[[!wikipedia "
"Linux_Unified_Key_Setup desc=\"LUKS\"]]</span>, the Linux standard for disk-"
"encryption."
msgstr ""
"[[Criptografe sua memória USB ou disco rígido externo|doc/"
"encryption_and_privacy/encrypted_volumes]] usando <span class=\"definition"
"
\">
[[!wikipedia L
UKS
]]</span>, a ferramenta
padrão do Linux para
"
"criptografia de disco."
"encryption_and_privacy/encrypted_volumes]] usando <span class=\"definition
\">
"
"[[!wikipedia L
inux_Unified_Key_Setup desc=\"LUKS\"
]]</span>, a ferramenta "
"
padrão do Linux para
criptografia de disco."
#. type: Bullet: ' - '
msgid ""
...
...
@@ -305,12 +307,13 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"Encrypt and sign your emails and documents using the *de facto* standard "
"<span class=\"definition\">[[!wikipedia OpenPGP]]</span> either from Tails "
"email client, text editor or file browser."
"<span class=\"definition\">[[!wikipedia Pretty_Good_Privacy#OpenPGP desc="
"\"OpenPGP\"]]</span> either from Tails email client, text editor or file "
"browser."
msgstr ""
"Criptografe e assine seus emails e documentos, usando o padrão *de facto* "
"<span class=\"definition\">[[!wikipedia OpenPGP]]</span> a partir do
cliente
"
"de emails do Tails, do editor de texto ou do navegador de arquivos."
"<span class=\"definition\">[[!wikipedia
_pt
OpenPGP]]</span> a partir do "
"
cliente
de emails do Tails, do editor de texto ou do navegador de arquivos."
#. type: Bullet: ' - '
msgid ""
...
...
@@ -403,7 +406,18 @@ msgstr "Imprensa e mídia\n"
#. type: Plain text
msgid "See [[Press and media information|press]]."
msgstr "Veja as [[informações na imprensa e na mídia|press]."
msgstr "Veja as [[informações na imprensa e na mídia|press]]."
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Contact\n"
msgid "Social Contract\n"
msgstr "Contato\n"
#. type: Plain text
msgid ""
"Read our [[Social Contract|contribute/working_together/social_contract]]."
msgstr ""
#. type: Title =
#, no-wrap
...
...
wiki/src/blueprint/Debian_Stretch.mdwn
View file @
2685a0a2
...
...
@@ -36,7 +36,7 @@ evaluate the idea of basing Tails on snapshots of Debian testing.
* 2016Q1 — Tails 2.0 is out
* August 2016 — start working on Tails 3.0 (1 week sprint with
all involved people) :intrigeri:anonym:
kytv:
all involved people) :intrigeri:anonym:
- get feature/stretch to build and boot
- update the automated test suite to test Tails/Stretch ISO images
* August 2016 to April 2017 — have one dedicated half-time, 1-week sprint
...
...
@@ -54,7 +54,8 @@ evaluate the idea of basing Tails on snapshots of Debian testing.
sprints, nor between them;
* we get a feeling of how "being based on snapshots of Debian
testing" would work.
* November 14-18th: second sprint (in-person, organized by intrigeri)
* November 14-18th: second sprint (in-person, organized by intrigeri),
release Tails 3.0~alpha1
* December 20-23: third sprint (remotely attended for everybody except
a couple of us)
* January 30 - February 3: fourth sprint (remotely attended); release
...
...
@@ -62,11 +63,13 @@ evaluate the idea of basing Tails on snapshots of Debian testing.
* February 2017 to Tails 3.0 release: keep 3.0~beta as up-to-date,
wrt. security vulnerabilities, as our 2.x channel is