[gnome-disk-utility] Clarify meaning of encryption/mounting options



commit 75dca699b44fa83feaa8522341070e932734a2e3
Author: Kai Lüke <kailueke riseup net>
Date:   Tue May 9 01:08:44 2017 +0200

    Clarify meaning of encryption/mounting options
    
    The dialogs to edit mount and encryption options
    are basically a graphical user interface to add
    corresponding entries in /etc/fstab and /etc/crypttab
    but the scope of the words 'automatic' and 'startup'
    is unclear.
    
    It is more precise to relate to the automatic (now called default)
    handling of the user session vs. manual policies for system startup.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=768769

 src/disks/ui/edit-crypttab-dialog.ui |    8 ++++----
 src/disks/ui/edit-fstab-dialog.ui    |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/disks/ui/edit-crypttab-dialog.ui b/src/disks/ui/edit-crypttab-dialog.ui
index 29a9401..486f2d1 100644
--- a/src/disks/ui/edit-crypttab-dialog.ui
+++ b/src/disks/ui/edit-crypttab-dialog.ui
@@ -89,7 +89,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Automatic Encryption Options</property>
+                    <property name="label" translatable="yes">Us_er Session Defaults</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">automatic-crypt-options-switch</property>
                     <attributes>
@@ -109,7 +109,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Switch off &lt;i&gt;Automatic 
Encryption Options&lt;/i&gt; to manage encryption options and passphrase for the device. The options 
correspond to an entry in the &lt;b&gt;/etc/crypttab&lt;/b&gt; file</property>
+                    <property name="tooltip_markup" translatable="yes">Switch off &lt;i&gt;User Session 
Defaults&lt;/i&gt; to manage encryption options and passphrase for the device. The options correspond to an 
entry in the &lt;b&gt;/etc/crypttab&lt;/b&gt; file</property>
                     <property name="use_action_appearance">False</property>
                   </object>
                   <packing>
@@ -301,13 +301,13 @@
                     <property name="column_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="crypttab-neg-noauto-checkbutton">
-                        <property name="label" translatable="yes">_Unlock at startup</property>
+                        <property name="label" translatable="yes">_Unlock at system startup</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_markup" translatable="yes">If checked, the device will be 
unlocked at startup [!noauto]</property>
+                        <property name="tooltip_markup" translatable="yes">If checked, the device will be 
unlocked at system startup [!noauto]</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
diff --git a/src/disks/ui/edit-fstab-dialog.ui b/src/disks/ui/edit-fstab-dialog.ui
index 70f97f6..5898053 100644
--- a/src/disks/ui/edit-fstab-dialog.ui
+++ b/src/disks/ui/edit-fstab-dialog.ui
@@ -43,7 +43,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Automatic Mount Options</property>
+                    <property name="label" translatable="yes">Us_er Session Defaults</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">automatic-mount-options-switch</property>
                     <attributes>
@@ -61,7 +61,7 @@
                   <object class="GtkSwitch" id="automatic-mount-options-switch">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="tooltip_markup" translatable="yes">Switch off &lt;i&gt;Automatic Mount 
Options&lt;/i&gt; to manage mount point and mount options for the device. The options correspond to an entry 
in the &lt;b&gt;/etc/fstab&lt;/b&gt; file</property>
+                    <property name="tooltip_markup" translatable="yes">Switch off &lt;i&gt;User Session 
Defaults&lt;/i&gt; to manage mount point and mount options for the device. The options correspond to an entry 
in the &lt;b&gt;/etc/fstab&lt;/b&gt; file</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -325,12 +325,12 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="fstab-neg-noauto-checkbutton">
-                        <property name="label" translatable="yes">Mount at _startup</property>
+                        <property name="label" translatable="yes">Mount at system _startup</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_markup" translatable="yes">If checked, the device will be 
mounted at startup [!noauto]</property>
+                        <property name="tooltip_markup" translatable="yes">If checked, the device will be 
mounted at system startup [!noauto]</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]