[Libreoffice-commits] core.git: 3 commits - svx/source svx/uiconfig

[Samuel Mehrbrodt]

 svx/source/dialog/SafeModeDialog.cxx |    5 +++--
 svx/uiconfig/ui/safemodedialog.ui    |    6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit b75468d7439e66b70d2a1ab2e3f77f5c46af7be3
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Thu Nov 3 14:24:09 2016 +0100

    SafeModeDialog: Adapt label to reality
    
    Change-Id: I649b1f1f9b8f5c50e69f2cd4228394cfa4d2974a

diff --git a/svx/uiconfig/ui/safemodedialog.ui b/svx/uiconfig/ui/safemodedialog.ui
index 91d2373..aa08341 100644
--- a/svx/uiconfig/ui/safemodedialog.ui
+++ b/svx/uiconfig/ui/safemodedialog.ui
@@ -299,7 +299,7 @@ The offered possible changes get more radical from top to bottom, so it is recom
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkCheckButton" id="check_reset_customizations">
-                    <property name="label" translatable="yes">Reset user customizations (settings, user interface modifications, AutoCorrect, AutoText, etc.)</property>
+                    <property name="label" translatable="yes">Reset settings and user interface modifications</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
commit 3d75d65526dd5515b781e0d587cfb8df702e320d
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Thu Nov 3 14:24:00 2016 +0100

    Fix some comments
    
    Change-Id: Ie74eaead67620decf9c9b954be1d13a8e5f400c6

diff --git a/svx/source/dialog/SafeModeDialog.cxx b/svx/source/dialog/SafeModeDialog.cxx
index 6403154..0909470 100644
--- a/svx/source/dialog/SafeModeDialog.cxx
+++ b/svx/source/dialog/SafeModeDialog.cxx
@@ -205,7 +205,7 @@ bool SafeModeDialog::Close()
 
 void SafeModeDialog::applyChanges()
 {
-    /// Restore
+    // Restore
     if (mpRadioRestore->IsChecked())
     {
         if (mpCBCheckProfilesafeConfig->IsChecked())
@@ -238,6 +238,7 @@ void SafeModeDialog::applyChanges()
         }
     }
 
+    // Deinstall
     if (mpRadioDeinstall->IsChecked())
     {
         if (mpCBDeinstallUserExtensions->IsChecked())
@@ -269,7 +270,7 @@ void SafeModeDialog::applyChanges()
         }
     }
 
-    // Then restart
+    // finally, restart
     css::task::OfficeRestartManager::get(comphelper::getProcessComponentContext())->requestRestart(
         css::uno::Reference< css::task::XInteractionHandler >());
 }
commit 2569c33f4a46240c9339c7b08568cbf4f1f3bfea
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Thu Nov 3 12:21:37 2016 +0100

    SafeModeDialog: Improve description
    
    Change-Id: I86f4a322f3d68caafcfe206e2d0f2164bc789bd8

diff --git a/svx/uiconfig/ui/safemodedialog.ui b/svx/uiconfig/ui/safemodedialog.ui
index fd6577c..91d2373 100644
--- a/svx/uiconfig/ui/safemodedialog.ui
+++ b/svx/uiconfig/ui/safemodedialog.ui
@@ -72,7 +72,9 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">%PRODUCTNAME is now running in Safe Mode. You can make one or more of the following changes to return to a working state.
+            <property name="label" translatable="yes">%PRODUCTNAME is now running in Safe Mode wich temporarily disables your configuration and extensions.
+
+You can make one or more of the following changes to return to a working state.
 
 The offered possible changes get more radical from top to bottom, so it is recommended to try them thoroughly one after the other.</property>
             <property name="wrap">True</property>