summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlrike Uhlig <u@451f.org>2017-05-25 12:14:25 +0200
committerUlrike Uhlig <u@451f.org>2017-05-25 12:14:25 +0200
commit6eb5112a299d39ad587c0652428602486712d5f9 (patch)
tree9f63a8ae18ac1d5a5d9c11ccad3dcb75d5a7836e
parente03bd678961c96eaf963eb0931df7abff7519f5f (diff)
parent2435afc205ed65dd24b4fc4141696a66f0d289b4 (diff)
Merge branch 'tails/jessie' into debian/sid
Conflicts: debian/changelog
-rw-r--r--data/tails-installer.appdata.xml33
-rw-r--r--debian/changelog36
-rw-r--r--debian/patches/10731.patch47
-rw-r--r--debian/patches/series1
-rw-r--r--po/es_AR.po19
-rw-r--r--po/fa.po11
-rw-r--r--po/pt.po11
-rw-r--r--po/sv.po17
-rwxr-xr-xsetup.py1
9 files changed, 148 insertions, 28 deletions
diff --git a/data/tails-installer.appdata.xml b/data/tails-installer.appdata.xml
new file mode 100644
index 0000000..4d6538d
--- /dev/null
+++ b/data/tails-installer.appdata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright © 2016 Tails developers <tails@boum.org> -->
+<component type="desktop">
+ <id>tails-installer.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-2.0+</project_license>
+ <name>Tails Installer</name>
+ <summary>Installer for the Tails live operating system</summary>
+ <description>
+ <p>
+ Tails Installer is a graphical tool to install or upgrade Tails on a USB
+ stick from an ISO image.
+ </p>
+ <p>
+ Tails Installer is the only installation technique that allows you to
+ benefit from automatic upgrades and create an encrypted persistent
+ storage for your personal files and settings in the rest of the available
+ space.
+ </p>
+ </description>
+ <url type="homepage">https://tails.boum.org/</url>
+ <url type="bugtracker">https://labs.riseup.net/code/projects/tails/</url>
+ <url type="donation">https://tails.boum.org/contribute/how/donate/</url>
+ <url type="help">https://tails.boum.org/doc/</url>
+ <screenshots>
+ <screenshot type="default">
+ <image>https://screenshots.debian.net/screenshots/000/014/555/large.png</image>
+ </screenshot>
+ </screenshots>
+ <update_contact>tails-dev@boum.org</update_contact>
+ <developer_name>Tails developers</developer_name>
+ <translation type="gettext">tails-installer</translation>
+</component>
diff --git a/debian/changelog b/debian/changelog
index 4b12057..96cbf06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,39 @@
+tails-installer (4.4.14+dfsg-0tails2) bugfix-10731-lists-non-removable-devices; urgency=medium
+
+ [ kurono ]
+ * Don't allow attempting to install on non-removable USB sticks
+ (Closes: #10731).
+
+ -- intrigeri <intrigeri@boum.org> Wed, 24 May 2017 15:12:34 +0000
+
+tails-installer (4.4.14+dfsg-0tails1) feature-stretch; urgency=medium
+
+ [ Ulrike Uhlig ]
+ * Debian packaging Git repository now lives on Alioth.
+ * Bump standards version.
+
+ [ Muri Nicanor ]
+ * Added an AppStream metadata file
+ * Add the AppStream metadata file to the files to be installed on linux
+
+ [ sajolida ]
+ * Use our usual copyright line
+ * Copy description from Debian package
+ * Fix typo
+ * If this is meant for users, then the general Tails homepage makes more sense
+ * This is an optional contact address for distributors (and not users)
+ * Use our usual name
+
+ [ intrigeri ]
+ * AppStream metadata: drop project_group tag with invalid value.
+ * AppStream metadata: reformat description to make `appstream-util validate' happy.
+ * AppStream metadata: add <translation> tag.
+
+ [ anonym ]
+ * Import PO files from Transifex, update POT and PO files.
+
+ -- anonym <anonym@riseup.net> Sat, 20 May 2017 10:52:25 +0200
+
tails-installer (4.4.13+dfsg-1) unstable; urgency=medium
* New upstream version.
diff --git a/debian/patches/10731.patch b/debian/patches/10731.patch
new file mode 100644
index 0000000..f97047e
--- /dev/null
+++ b/debian/patches/10731.patch
@@ -0,0 +1,47 @@
+diff --git a/tails_installer/creator.py b/tails_installer/creator.py
+index 71bbea4..95a4102 100755
+--- a/tails_installer/creator.py
++++ b/tails_installer/creator.py
+@@ -575,7 +575,6 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator):
+
+ def detect_supported_drives(self, callback=None, force_partitions=False):
+ """ Detect all supported (USB and SDIO) storage devices using UDisks.
+- Note that the removable bit is not checked.
+ """
+ mounted_parts = {}
+ self.drives = {}
+@@ -609,7 +608,13 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator):
+ 'size': drive.props.size,
+ 'mounted_partitions': set(),
+ 'is_device_big_enough': True,
++ 'removable': drive.props.media_removable,
+ }
++
++ # Check non-removable drives
++ if not data['removable']:
++ self.log.debug('Skipping non-removable device: %s' % data['device'])
++
+ # Only pay attention to USB and SDIO devices, unless --force'd
+ iface = drive.props.connection_bus
+ if iface != 'usb' and iface != 'sdio' and self.opts.force != data['device']:
+diff --git a/tails_installer/gui.py b/tails_installer/gui.py
+index 5018bc7..10b75b3 100755
+--- a/tails_installer/gui.py
++++ b/tails_installer/gui.py
+@@ -483,6 +483,16 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
+ 'model': info['model'],
+ 'details': details
+ }
++ # Skip devices with non-removable bit enabled
++ if not info['removable']:
++ message =_('The USB stick "%(pretty_name)s"'
++ ' is configured as non-removable by its'
++ ' manufacturer and Tails will fail to start on it.'
++ ' Please try installing on a different model.') % {
++ 'pretty_name': pretty_name
++ }
++ self.status(message)
++ continue
+ # Skip too small devices, but inform the user
+ if not info['is_device_big_enough']:
+ message =_('The device "%(pretty_name)s"'
diff --git a/debian/patches/series b/debian/patches/series
index 10d87a0..0c77508 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
tails-installer-as-helper
+10731.patch
diff --git a/po/es_AR.po b/po/es_AR.po
index 685caa5..1bcb002 100644
--- a/po/es_AR.po
+++ b/po/es_AR.po
@@ -6,19 +6,20 @@
# Daniel Gray, 2015
# TorUserSpanishHelp, 2013
# guille1981 <jguillermooliver@hotmail.com>, 2014
-# José Fabián <ar.jfabian+transifex@gmail.com>, 2014
+# Joaquín Serna, 2017
+# José Fabián, 2014
# Juan José Zapponi <zapponi.juan.jose@gmail.com>, 2014
# Juan Manuel Cruz <cruz.jm.stafe@gmail.com>, 2013
# Pablo Di Noto <pdinoto@gmail.com>, 2016
-# psss <FacundoAcevedo@users.noreply.github.com>, 2016
+# psss <facevedo@openmailbox.org>, 2016
# sbosio <santiago.bosio@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-06 20:38+0200\n"
-"PO-Revision-Date: 2016-05-10 20:56+0000\n"
-"Last-Translator: psss <FacundoAcevedo@users.noreply.github.com>\n"
+"POT-Creation-Date: 2017-05-20 10:48+0200\n"
+"PO-Revision-Date: 2017-05-13 00:49+0000\n"
+"Last-Translator: Joaquín Serna\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/"
"language/es_AR/)\n"
"Language: es_AR\n"
@@ -33,7 +34,7 @@ msgstr "Debe ejecutar esta aplicación como superusuario"
#: ../tails_installer/creator.py:146
msgid "Extracting live image to the target device..."
-msgstr "Extrayendo imagen \"live\" en el dispositivo destino..."
+msgstr "Extrayendo imagen \"live\" en el dispositivo de destino..."
#: ../tails_installer/creator.py:153
#, python-format
@@ -127,7 +128,7 @@ msgid ""
"Some partitions of the target device %(device)s are mounted. They will be "
"unmounted before starting the installation process."
msgstr ""
-"Algunas particiones del dispositivo destino %(device)s están montadas y "
+"Algunas particiones del dispositivo de destino %(device)s están montadas y "
"serán desmontadas antes de comenzar con la instalación."
#: ../tails_installer/creator.py:735 ../tails_installer/creator.py:959
@@ -402,7 +403,7 @@ msgid ""
"Tails on this device."
msgstr ""
"Es imposible actualizar el dispositivo %(pretty_name)s por que no fue creado "
-"usando un instalador de Tails. Deberias usar %(action)s para actualizar "
+"usando un Instalador de Tails. Deberias usar %(action)s para actualizar "
"Tails en este dispositivo."
#: ../tails_installer/gui.py:523
@@ -544,7 +545,7 @@ msgstr ""
#: ../data/tails-installer.ui.h:3
#, fuzzy
msgid "Target Device:"
-msgstr "Dispositivo destino"
+msgstr "Dispositivo de Destino"
#: ../data/tails-installer.ui.h:4
msgid "Install Tails"
diff --git a/po/fa.po b/po/fa.po
index dc2f16f..d996f9a 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Amir Moezzi <amirreza.mz@yahoo.com>, 2017
# zmix <check_people_status@yahoo.com>, 2013
# Mohammad Hossein <desmati@gmail.com>, 2014
# Eric D Smallberg <esmallberg@ndi.org>, 2013
@@ -20,9 +21,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-06 20:38+0200\n"
-"PO-Revision-Date: 2016-06-03 11:49+0000\n"
-"Last-Translator: Farshad Gh <farshad73@gmail.com>\n"
+"POT-Creation-Date: 2017-05-20 10:48+0200\n"
+"PO-Revision-Date: 2017-05-19 07:01+0000\n"
+"Last-Translator: Amir Moezzi <amirreza.mz@yahoo.com>\n"
"Language-Team: Persian (http://www.transifex.com/otf/torproject/language/"
"fa/)\n"
"Language: fa\n"
@@ -547,7 +548,7 @@ msgstr "دستگاه هدف"
#: ../data/tails-installer.ui.h:4
msgid "Install Tails"
-msgstr "نصب تیلز"
+msgstr "نصب مسیرها"
#: ../data/tails-installer-launcher.ui.h:1
msgid ""
@@ -559,7 +560,7 @@ msgstr ""
#: ../data/tails-installer-launcher.ui.h:2
#, fuzzy
msgid "Install"
-msgstr "نصب تیلز"
+msgstr "نصب مسیرها"
#: ../data/tails-installer-launcher.ui.h:3
msgid "• Install Tails on a new USB stick."
diff --git a/po/pt.po b/po/pt.po
index 4f5851b..0e6a524 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-06 20:38+0200\n"
-"PO-Revision-Date: 2017-02-28 16:12+0000\n"
+"POT-Creation-Date: 2017-05-20 10:48+0200\n"
+"PO-Revision-Date: 2017-04-14 14:16+0000\n"
"Last-Translator: Manuela Silva <manuela.silva@sky.com>\n"
"Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/"
"pt/)\n"
@@ -672,10 +672,9 @@ msgstr ""
#~ "font-weight:400; font-style:normal;\">\n"
#~ "<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-"
#~ "left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"
-#~ "\">Necessita de ajuda? Consulte a <a href=\"file:///usr/share/doc/tails/"
-#~ "website/doc/first_steps/installation.en.html\"><span style=\" text-"
-#~ "decoration: underline; color:#0000ff;\">documentação</span></a>.</p></"
-#~ "body></html>"
+#~ "\">Precisa de ajuda? Leia a <a href=\"file:///usr/share/doc/tails/website/"
+#~ "doc/first_steps/installation.en.html\"><span style=\" text-decoration: "
+#~ "underline; color:#0000ff;\">documentação</span></a>.</p></body></html>"
#~ msgid ""
#~ "<ul>\n"
diff --git a/po/sv.po b/po/sv.po
index a9f0dd1..34a567d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3,21 +3,22 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Anders Nilsson <locally@devode.se>, 2015
+# Anders Nilsson <anders@devode.se>, 2015
# cryptohead <cryptohead@gmail.com>, 2013
# Foorack <maxfaxalv@gmail.com>, 2015
# Gabor Sebastiani, 2014
# Göran Uddeborg <goeran@uddeborg.se>, 2010
+# Jonatan Nyberg <jonatan@autistici.org>, 2017
# Mikael Hiort af Ornäs <mikael.hafo@hotmail.com>, 2013
-# leveebreaks, 2014
+# Isis, 2014
# WinterFairy <winterfairy@riseup.net>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-06 20:38+0200\n"
-"PO-Revision-Date: 2016-03-21 16:31+0000\n"
-"Last-Translator: Anders Nilsson <locally@devode.se>\n"
+"POT-Creation-Date: 2017-05-20 10:48+0200\n"
+"PO-Revision-Date: 2017-04-14 02:23+0000\n"
+"Last-Translator: Jonatan Nyberg <jonatan@autistici.org>\n"
"Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/"
"sv/)\n"
"Language: sv\n"
@@ -474,7 +475,7 @@ msgstr ""
#: ../tails_installer/gui.py:731
#, python-format
msgid "%(filename)s selected"
-msgstr "%(filename)s vald"
+msgstr "%(filename)s valda"
#: ../tails_installer/source.py:28
#, fuzzy
@@ -631,10 +632,10 @@ msgid ""
msgstr ""
#~ msgid "\"Clone & Install\""
-#~ msgstr "\"Klona & Installera\""
+#~ msgstr "\"Klona & installera\""
#~ msgid "%(distribution)s Installer"
-#~ msgstr "%(distribution)s Installerare"
+#~ msgstr "%(distribution)s installerare"
#~ msgid ""
#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
diff --git a/setup.py b/setup.py
index 1f4a3f8..6ae8a0a 100755
--- a/setup.py
+++ b/setup.py
@@ -117,6 +117,7 @@ else:
maintainer_email = 'tails@boum.org',
data_files = [("/usr/share/applications",
[ "data/tails-installer-launcher.desktop" ]),
+ ("/usr/share/appdata", ["data/tails-installer.appdata.xml"]),
("/usr/share/pixmaps",["data/tails-installer.svg"]),
("/usr/share/tails-installer", ["data/tails-installer.ui",
"data/tails-installer-launcher.ui",