[Pkg-privacy-commits] [tails-installer] 46/70: Shorten

[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 e1908d0db87574782d2e12fa85e048fed534aeeb
Author: sajolida <sajolida at pimienta.org>
Date:   Tue Mar 14 17:22:23 2017 +0000

    Shorten
    
    - Instead of the first sentence we should have [Install] or [Upgrade]
      buttons instead of [Yes].
    - "Continue?" would then become useless as well.
    - Adding a line of white space between the USB stick description and the
      line about data deletion should make the message better structured and
      easier to scan.
---
 tails_installer/gui.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/tails_installer/gui.py b/tails_installer/gui.py
index a4264ae..fea2e01 100755
--- a/tails_installer/gui.py
+++ b/tails_installer/gui.py
@@ -700,10 +700,8 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
             if not self.confirmed:
                 if self.show_confirmation_dialog(
                         _("Confirm the target USB stick"),
-                        _("You are going to install Tails on the "
-                          "%(size)s %(vendor)s %(model)s device (%(device)s). "
-                          "All data on this USB stick will be lost. "
-                          "Continue?") %
+                        _("%(size)s %(vendor)s %(model)s device (%(device)s)\n\n"
+                          "All data on this USB stick will be lost.") %
                           {'vendor': self.live.drive['vendor'],
                            'model':  self.live.drive['model'],
                            'device': self.live.drive['device'],
@@ -718,10 +716,8 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
                 # let's go on
                 self.confirmed = False
         else:
-            msg = (_("You are going to upgrade Tails on the %(parent_size)s "
-                     "%(vendor)s %(model)s device (%(device)s). "
-                     "The persistent storage on this USB stick will be preserved. "
-                     "Continue?") % {
+            msg = (_("%(vendor)s %(model)s device (%(device)s)\n\n"
+                     "The persistent storage on this USB stick will be preserved.") % {
                          'vendor': self.live.drive['vendor'],
                          'model':  self.live.drive['model'],
                          'device': self.live.drive['device'],

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