[Pkg-privacy-commits] [tails-installer] 52/70: Merge branch 'master' into feature/9005-Improve-tails-installer

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

ulrike pushed a commit to annotated tag tails-installer_4.20
in repository tails-installer.

commit 79cf137e9cc9015881969fcd5838ba49c2b72399
Merge: c353167 83fa64c
Author: kurono <andres.gomez at cern.ch>
Date:   Thu Jun 8 18:38:51 2017 +0200

    Merge branch 'master' into feature/9005-Improve-tails-installer
    
    Conflicts:
    	po/fr.po
    	tails_installer/gui.py

 HACKING                          |  10 +
 data/tails-installer.appdata.xml |  33 +++
 po/ar.po                         |   2 +-
 po/az.po                         |   2 +-
 po/bg.po                         |   2 +-
 po/ca.po                         |   2 +-
 po/cs.po                         |   2 +-
 po/da.po                         |  92 +++---
 po/de.po                         |   2 +-
 po/el.po                         |   2 +-
 po/en_GB.po                      |   2 +-
 po/es.po                         |  93 +++---
 po/es_AR.po                      |  19 +-
 po/eu.po                         |   2 +-
 po/fa.po                         |  11 +-
 po/fi.po                         |   2 +-
 po/fr.po                         | 608 +++++++++++++++++----------------------
 po/fr_CA.po                      |   2 +-
 po/gl.po                         |   2 +-
 po/he.po                         |   2 +-
 po/hr_HR.po                      |   2 +-
 po/hu.po                         |   2 +-
 po/id.po                         |   2 +-
 po/is.po                         | 464 ++++++++++++++++++++++++------
 po/it.po                         |   2 +-
 po/ja.po                         |   2 +-
 po/km.po                         |   2 +-
 po/ko.po                         |   2 +-
 po/lb.po                         |   2 +-
 po/lv.po                         |   2 +-
 po/nb.po                         |  10 +-
 po/nl.po                         |   2 +-
 po/nn.po                         |   2 +-
 po/pl.po                         |   2 +-
 po/pt.po                         | 293 ++++++++++---------
 po/pt_BR.po                      |   2 +-
 po/ro.po                         |   2 +-
 po/ru.po                         |   2 +-
 po/si_LK.po                      |   2 +-
 po/sk.po                         |   2 +-
 po/sk_SK.po                      |   2 +-
 po/sl_SI.po                      |   2 +-
 po/sq.po                         |   2 +-
 po/sv.po                         |  17 +-
 po/tails-installer.pot           |   2 +-
 po/th.po                         |   2 +-
 po/tr.po                         |   2 +-
 po/uk.po                         |   2 +-
 po/vi.po                         |   2 +-
 po/zh_CN.po                      |  41 +--
 po/zh_HK.po                      |   2 +-
 po/zh_TW.po                      |   2 +-
 setup.py                         |   1 +
 tails_installer/creator.py       |   7 +-
 tails_installer/gui.py           |  10 +
 55 files changed, 1040 insertions(+), 749 deletions(-)

diff --cc tails_installer/gui.py
index 98fcc0c,10b75b3..46309db
--- a/tails_installer/gui.py
+++ b/tails_installer/gui.py
@@@ -553,9 -467,32 +553,19 @@@ class TailsInstallerWindow(Gtk.Applicat
                  # Skip LUKS-encrypted partitions
                  if info['fstype'] and info['fstype'] == 'crypto_LUKS':
                      self.live.log.debug('Skipping LUKS-encrypted partition: %s' % info['device'])
 +                    self.device_with_persistence.append(info['parent'])
                      continue
 -                size = _format_bytes_in_gb(info['parent_size']
 -                                           if info['parent_size']
 -                                           else info['size'])
 -                details = (_("%(size)s %(label)s") % {
 -                                'label': info['label'],
 -                                'size': size
 -                            }
 -                           if info['label']
 -                           else size)
 -                pretty_name = _("%(vendor)s %(model)s (%(details)s) - %(device)s") % {
 -                    'device':  info['device'],
 -                    'vendor':  info['vendor'],
 -                    'model':   info['model'],
 -                    'details': details
 -                }
 +                pretty_name = self.get_device_pretty_name(info)
+                 # 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"'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git