summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-10-30 14:56:31 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-10-30 15:07:19 +0000
commit6ac621f1e07c2717d69880866522056996fe9546 (patch)
treea822441ee60434a05dccf9e3453112d3cc9987e9
parentf6011536a888be3a4e1cda2de9532b6ba3f4a275 (diff)
Resolves: fdo#80815 rename Cancel and explain what it will do
Change-Id: Ifdd68f7e415176062b9eee6825b3c0bb09cb05db
-rw-r--r--svx/source/dialog/docrecovery.src2
-rw-r--r--svx/source/inc/docrecovery.hxx2
-rw-r--r--svx/uiconfig/ui/docrecoveryrecoverdialog.ui5
3 files changed, 5 insertions, 4 deletions
diff --git a/svx/source/dialog/docrecovery.src b/svx/source/dialog/docrecovery.src
index eb55d1f54fa5..8f8cd98fa368 100644
--- a/svx/source/dialog/docrecovery.src
+++ b/svx/source/dialog/docrecovery.src
@@ -24,7 +24,7 @@
String RID_SVXSTR_QUERY_EXIT_RECOVERY
{
- Text [ en-US ] = "Are you sure you want to cancel the %PRODUCTNAME document recovery?";
+ Text [ en-US ] = "Are you sure you want to discard the %PRODUCTNAME document recovery data?";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 74946f132e08..c29d1397d9a5 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -502,7 +502,7 @@ class RecoveryDialog : public Dialog
vcl::Window* m_pProgrParent;
RecovDocList* m_pFileListLB;
PushButton* m_pNextBtn;
- CancelButton* m_pCancelBtn;
+ PushButton* m_pCancelBtn;
OUString m_aTitleRecoveryInProgress;
OUString m_aRecoveryOnlyFinish;
OUString m_aRecoveryOnlyFinishDescr;
diff --git a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
index 034380e86a3f..fe77eb83a818 100644
--- a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
+++ b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
@@ -35,12 +35,11 @@
</child>
<child>
<object class="GtkButton" id="cancel">
- <property name="label">gtk-cancel</property>
+ <property name="label">Discard Recovery Data</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -77,6 +76,8 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">Press 'Start Recovery' to start the recovery process of the documents listed below.
+Press 'Discard Recovery Data' to abandon attempting recovery of these document.
+
The 'Status' column shows whether the document can be recovered.</property>
<property name="wrap">True</property>
<property name="max_width_chars">87</property>