intrigeri:
> Hi,
>
> sajolida wrote (08 Apr 2012 15:37:02 GMT) :
>> I'm not sure which option is the best, the plugin or the handmade
>> anchors. What do you think?
>
> Thanks for the explanation.
>
> It seems to me the plugin would not fix anything at all:
> it would not make it any more obvious, to someone doing a seemingly
> unrelated change in page B, that s/he's breaking a link from page A to
> page B.
>
> So I prefer the handmade anchors: at least their purpose is clear,
> as they're only useful as link targets. So, changing an anchor is
> obviously breaking links, that should be updated accordingly.
>
> Makes sense?
Ok, I did that, see 3396bff.
>>>> - doc/first_steps/startup_options
>>>
>>> The screenshot does not display the widgets that allow the user to
>>> choose their preferred language and keyboard layout.
>>> Is this intentional?
>
>> Nope. But I double-checked and it doesn't appear on my virtual
>> machine! Maybe that's a side effect of the "VirtualBox guest modules
>> are only built for amd64" bug. I'll try again with the RC1 once
>> I got one.
>
> Current devel branch has that bug workaround'd.
>
>>>> - doc/first_steps/persistence/warnings
>>>
>>> When I read this:
>>>
>>> Remember also that secure deletion do not work as expected on USB
>>> sticks. See the corresponding documentation. Read how to delete the
>>> persistent storage instead.
>>>
>>> I think this suggests the "delete the persistent storage" page deals
>>> with secure deletion of that storage area. However, the first set of
>>> instructions given on that other page "choose Applications ▸ Tails
>>> ▸ Delete persistent storage, and click on the Delete button." does not
>>> support secure deletion yet, and the other sets of instructions either
>>> let me totally doubtful, or just don't work. See other problems in
>>> this area later on.
>
>> Ok, see 29ad316.
>
> I see no such commit.
Sorry, I had a couple of commits that we not in any branch, weird.
Now this is in 239c495 and 548707b.
>> What about:
>
>> « To protect your anonymity and leave no trace, Tails developers
>> select and configure with care programs that work well together.
>> **Installing additional programs may introduce unpredictable
>> problems and may break the protections built-in Tails.** Tails
>> developers may not want or may not be capable of helping you to
>> solve those problems. »
>
> Suits me well.
Ok, done in 9727715.
>>>> - doc/first_steps/persistence/delete
>>>
>>> "Creating a new persistent storage on top of an old one makes it hard
>>> for an attacker to recover the files of the old persistent storage
>>> using data recovery techniques" --> Why? Because you suppose the old
>>> LUKS header to be overwritten by a newer one? If this is the only
>>> reason, I don't think we can seriously base anything on this. E.g.
>>> the modern partitioning tools we're using (namely: udisks) try to be
>>> clever wrt. sector alignment, and e.g. I would not bet Wheezy's udisks
>>> (in Tails 2.0), will create a new persistent storage exactly at the
>>> same place as Squeeze's udisks (in Tails 0.11) did.
>
>> Ok, you're right. Please see 301e40b.
>
> I see no such commit in there.
Same thing, see 4c38ec6.
>>> 1. Erase Tails
>>> 2. Securely clean all the available disk space
>>>
>>> --> I think #2 only works if there's a filesystem on the target USB
>>> stick, which is not true after following #1.
>
>> Ok, I see two ways of solving that:
>> [...]
>> 2. Add a step linking to "Create an encrypted volume" on the whole USB
>> stick before doing "Securely clean…" and be done with it.
>
> Looks easier to write and maintain.
Ok, see 2a84d74.
>> Maybe I can replace it by "persistent volume". That's the term used
>> by the Disk Utility and we already used it in "Create and use
>> encrypted volumes".
>
> Suits me well. In tails-persistence-setup, I've tried to follow the
> Disk Utility terminology.
Ok, I changed all the "persistence storage" by "persistent volume" and
I'm not using the word "storage" anymore. If we agree on this
terminology then you might want to change the following GUI accordingly.
I'm sending you a patch on tails-persistence-setup. Feel free to apply
whatever we find relevant.
- I also changed "persistence filesystem", "persistent data" and
"persistent partition" to "persistence volume".
- I prefer to use "start" and "restart" than "boot" and "reboot", I
think it's less lingo and as precise. I'm also using "working session"
to explain the persistence between reboots. What do you think about this
last term?
- I changed "decide" to "specify", see the GDP Style Guide on that verb.
The GUI is linking to the documentation on persistence in
doc/advanced_topics. That made me realize that I put it under
doc/first_steps but maybe that was not what was decide. I don't mind
moving it to doc/advanced_topics if we want to hide it a bit more from
beginners.
> Also:
>> -Remember also that **secure deletion does not work as expected on USB sticks.**<br/>
>> +Note also that **secure deletion do not work as expected on USB sticks.**<br/>
>
> You're reverting my s/do/does/, that I called a grammar fix.
> Why should "secure deletion" not be treated as a singular, third
> person subject of the "do" verb?
Sorry, fixed in 548707b.
--
sajolida
From 6f9fc0df4652ee89c36e4f63eafaac7372ea3fbc Mon Sep 17 00:00:00 2001
From: sajolida <sajolida@???>
Date: Wed, 11 Apr 2012 13:18:51 +0200
Subject: [PATCH] Rephrase a bunch of GUI messages.
---
lib/Tails/Persistence/Setup.pm | 14 +++++++-------
lib/Tails/Persistence/Step/Bootstrap.pm | 8 ++++----
lib/Tails/Persistence/Step/Configure.pm | 6 +++---
lib/Tails/Persistence/Step/Delete.pm | 8 ++++----
.../applications/tails-persistence-delete.desktop | 4 ++--
share/applications/tails-persistence-setup.desktop | 4 ++--
6 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/lib/Tails/Persistence/Setup.pm b/lib/Tails/Persistence/Setup.pm
index 1cd96b2..7396498 100644
--- a/lib/Tails/Persistence/Setup.pm
+++ b/lib/Tails/Persistence/Setup.pm
@@ -285,7 +285,7 @@ sub _build_system_partition_attributes {
sub _build_main_window {
my $self = shift;
my $win = Gtk2::Window->new('toplevel');
- $win->set_title($self->encoding->decode(gettext('Setup Tails persistent storage')));
+ $win->set_title($self->encoding->decode(gettext('Setup Tails persistent volume')));
$win->set_border_width(10);
@@ -451,7 +451,7 @@ sub check_sanity {
{
method => 'persistence_is_enabled',
message => $self->encoding->decode(gettext(
- "Persistent volume is in use: persistence is enabled.")),
+ "Cannot delete the persistent volume while in use. You should restart Tails without persistence.")),
must_be_false => 1,
},
],
@@ -470,22 +470,22 @@ sub check_sanity {
{
method => 'persistence_partition_is_unlocked',
message => $self->encoding->decode(gettext(
- "Persistence partition is not unlocked.")),
+ "Persistence volume is not unlocked.")),
},
{
method => 'persistence_filesystem_is_mounted',
message => $self->encoding->decode(gettext(
- "Persistence filesystem is not mounted.")),
+ "Persistence volume is not mounted.")),
},
{
method => 'persistence_filesystem_is_readable',
message => $self->encoding->decode(gettext(
- "Persistence filesystem is not readable. Permissions or ownership problems?")),
+ "Persistence volume is not readable. Permissions or ownership problems?")),
},
{
method => 'persistence_filesystem_is_writable',
message => $self->encoding->decode(gettext(
- "Persistence filesystem is not writable. Maybe it was mounted read-only?")),
+ "Persistence volume is not writable. Maybe it was mounted read-only?")),
},
);
}
@@ -851,7 +851,7 @@ sub goto_next_step {
q{Persistence wizard - Finished}
)));
$self->current_step->subtitle->set_text($self->encoding->decode(gettext(
- q{Any changes you have made will only take effect after rebooting.
+ q{Any changes you have made will only take effect after restarting Tails.
You may now close this application.}
)));
diff --git a/lib/Tails/Persistence/Step/Bootstrap.pm b/lib/Tails/Persistence/Step/Bootstrap.pm
index 8607793..951a5b4 100644
--- a/lib/Tails/Persistence/Step/Bootstrap.pm
+++ b/lib/Tails/Persistence/Step/Bootstrap.pm
@@ -51,14 +51,14 @@ sub BUILD {
my $self = shift;
$self->title->set_text($self->encoding->decode(gettext(
- q{Persistence wizard - Storage setup}
+ q{Persistence wizard - Persistent volume creation}
)));
$self->subtitle->set_text($self->encoding->decode(gettext(
- q{Choose a passphrase to protect your persistent data}
+ q{Choose a passphrase to protect the persistent volume}
)));
$self->description->set_markup($self->encoding->decode(sprintf(
# TRANSLATORS: size, device vendor, device model
- gettext(q{A %s persistent storage area will be created on the <b>%s %s</b> device. Persistent data on this device will be stored in an encrypted form protected by a passphrase.}),
+ gettext(q{A %s persistent volume will be created on the <b>%s %s</b> device as an encrypted partition protected by a passphrase.}),
format_bytes($self->size_of_free_space, mode => "iec"),
$self->device_vendor,
$self->device_model,
@@ -304,7 +304,7 @@ sub go_button_pressed {
$self->encoding->decode(gettext(q{Creating...})),
);
$self->description->set_text(
- $self->encoding->decode(gettext(q{Creating persistent storage area...})),
+ $self->encoding->decode(gettext(q{Creating the persistent volume...})),
);
$self->go_callback->(
diff --git a/lib/Tails/Persistence/Step/Configure.pm b/lib/Tails/Persistence/Step/Configure.pm
index 2825d8c..6200f2e 100644
--- a/lib/Tails/Persistence/Step/Configure.pm
+++ b/lib/Tails/Persistence/Step/Configure.pm
@@ -57,14 +57,14 @@ sub BUILD {
my $self = shift;
$self->title->set_text($self->encoding->decode(gettext(
- q{Persistence wizard - Configuration}
+ q{Persistence wizard - Persistent volume configuration}
)));
$self->subtitle->set_text($self->encoding->decode(gettext(
- q{Decide which files should persist}
+ q{Specify the files that will be saved in the persistent volume}
)));
# TRANSLATORS: partition, size, device vendor, device model
$self->description->set_markup($self->encoding->decode(sprintf(
- gettext(q{The selected files will be stored on the Tails persistence partition %s (%s), on the <b>%s %s</b> device.}),
+ gettext(q{The selected files will be stored in the encrypted partition %s (%s), on the <b>%s %s</b> device.}),
$self->persistence_partition,
format_bytes($self->persistence_partition_size, mode => "iec"),
$self->device_vendor,
diff --git a/lib/Tails/Persistence/Step/Delete.pm b/lib/Tails/Persistence/Step/Delete.pm
index f5a0a90..65aac98 100644
--- a/lib/Tails/Persistence/Step/Delete.pm
+++ b/lib/Tails/Persistence/Step/Delete.pm
@@ -38,14 +38,14 @@ sub BUILD {
my $self = shift;
$self->title->set_text($self->encoding->decode(gettext(
- q{Persistence wizard - Storage removal}
+ q{Persistence wizard - Persistent volume deletion}
)));
$self->subtitle->set_text($self->encoding->decode(gettext(
q{Your persistent data will be deleted.}
)));
# TRANSLATORS: partition, size, device vendor, device model
$self->description->set_markup($self->encoding->decode(sprintf(
- gettext(q{The Tails persistence partition %s (%s), on the <b>%s %s</b> device, will be deleted.}),
+ gettext(q{The persistent volume %s (%s), on the <b>%s %s</b> device, will be deleted.}),
$self->persistence_partition,
format_bytes($self->persistence_partition_size, mode => "iec"),
$self->device_vendor,
@@ -96,10 +96,10 @@ sub go_button_pressed {
$self->working(1);
$self->subtitle->set_text(
- $self->encoding->decode(gettext(q{Removing...})),
+ $self->encoding->decode(gettext(q{Deleting...})),
);
$self->description->set_text(
- $self->encoding->decode(gettext(q{Removing persistent storage area...})),
+ $self->encoding->decode(gettext(q{Deleting the persistent volume...})),
);
$self->go_callback->(
diff --git a/share/applications/tails-persistence-delete.desktop b/share/applications/tails-persistence-delete.desktop
index 33d189c..060cba4 100644
--- a/share/applications/tails-persistence-delete.desktop
+++ b/share/applications/tails-persistence-delete.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
Type=Application
-Name=Delete persistent storage area
+Name=Delete persistent volume
Name[fr]=Supprimer le volume de stockage persistent
-Comment=Delete the persistent storage area and its content
+Comment=Delete the persistent volume and its content
Comment[fr]=Supprimer le volume de stockage persistent et son contenu
Icon=tails-persistence-setup.png
Exec=tails-persistence-setup --step delete
diff --git a/share/applications/tails-persistence-setup.desktop b/share/applications/tails-persistence-setup.desktop
index d5fd5ff..ea5f087 100644
--- a/share/applications/tails-persistence-setup.desktop
+++ b/share/applications/tails-persistence-setup.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
Type=Application
-Name=Configure persistent storage
+Name=Configure persistent volume
Name[fr]=Configurer le stockage persistent
-Comment=Tune what data and application configuration persist between reboots
+Comment=Configure which files and application configuration are saved between working sessions
Comment[fr]=Configurer quelles données, et la configuration de quelles applications, sont conservées d'un démarrage à l'autre
Icon=tails-persistence-setup.png
Exec=tails-persistence-setup
--
1.7.9.1
