officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 5 +-
officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 4 -
sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx | 2
sc/uiconfig/scalc/ui/duplicaterecordsdlg.ui | 24
++++++----
4 files changed, 22 insertions(+), 13 deletions(-)
New commits:
commit 7a1636a24f8a4c856348bb6781aef4a494227691
Author: Sahil Gautam <sa...@libreoffice.org>
AuthorDate: Sun Sep 29 15:39:31 2024 +0000
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Sat Oct 5 20:00:48 2024 +0200
tdf#85976 change labels as suggested in comment 73 on the ticket
1) On first call, "by column" was selected although that is the less common
case.
> now by row is selected by default
2) The meaning of "Orientation" is not really clear. Suggestion: Compare:
rows columns
> changed as suggested
3) The purpose of "Items" is unclear.
> renamed "Items" to "Records"
4) Help page does not exist.
> help page patch has been merged
5) If a database range is selected, the dialog does not consider the
property "Contains column labels" of the database range.
> didn't quite get this one; require some help to reproduce
6) It is not usual to use "Okay", but other dialogs have it named "OK".
> changed as suggested.
7) Command has no extended tip.
> Added TooltipLabel
```
<prop oor:name="TooltipLabel" oor:type="xs:string">
<value xml:lang="en-US">Remove or select duplicate records from the
selection</value>
</prop>
```
Change-Id: I9579af68b396cddeca608dc077af3b468191942b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174201
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 2f9724f2f50b..43b76f02761e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1380,7 +1380,10 @@
</node>
<node oor:name=".uno:HandleDuplicateRecords" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Duplicate Records...</value>
+ <value xml:lang="en-US">Handle Duplicate Records...</value>
+ </prop>
+ <prop oor:name="TooltipLabel" oor:type="xs:string">
+ <value xml:lang="en-US">Remove or select duplicate records from the
selection</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 42eeae9d25c8..cb557431362b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1808,9 +1808,9 @@
<!-- UIHints: Data - Duplicate Records... -->
<info>
<desc>Indicates whether to remove rows, or columns in the 'handle
duplicate records' dialog.</desc>
- <label>Data includes row/column headers</label>
+ <label>Compare rows</label>
</info>
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="RemoveRecords" oor:type="xs:boolean"
oor:nillable="false">
<!-- UIHints: Data - Duplicate Records... -->
diff --git a/sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx
b/sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx
index 11cbfbbbd4c3..a3dfbf4f175b 100644
--- a/sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx
+++ b/sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx
@@ -40,7 +40,7 @@ ScDuplicateRecordsDlg::ScDuplicateRecordsDlg(weld::Window*
pParent,
, m_xRadioRemove(m_xBuilder->weld_radio_button("remove"))
, m_xCheckList(m_xBuilder->weld_tree_view("checklist"))
, m_xAllChkBtn(m_xBuilder->weld_check_button("allcheckbtn"))
- , m_xOkBtn(m_xBuilder->weld_button("okaybtn"))
+ , m_xOkBtn(m_xBuilder->weld_button("okbtn"))
, m_xHelpBtn(m_xBuilder->weld_button("helpbutton"))
, mrCellData(rData)
, mrRange(rRange)
diff --git a/sc/uiconfig/scalc/ui/duplicaterecordsdlg.ui
b/sc/uiconfig/scalc/ui/duplicaterecordsdlg.ui
index 4b21b26d5cb1..6a371f8d5428 100644
--- a/sc/uiconfig/scalc/ui/duplicaterecordsdlg.ui
+++ b/sc/uiconfig/scalc/ui/duplicaterecordsdlg.ui
@@ -48,8 +48,8 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="okaybtn">
- <property name="label" translatable="yes"
context="duplicaterecordsdialog|okaybtn">_Okay</property>
+ <object class="GtkButton" id="okbtn">
+ <property name="label" translatable="yes"
context="duplicaterecordsdialog|okbtn">_OK</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
@@ -90,11 +90,11 @@
<property name="row-spacing">6</property>
<property name="column-spacing">6</property>
<child>
- <object class="GtkLabel" id="orientation">
+ <object class="GtkLabel" id="compare">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="valign">start</property>
- <property name="label" translatable="yes"
context="duplicaterecordsdialog|orientation">Orientation:</property>
+ <property name="label" translatable="yes"
context="duplicaterecordsdialog|compare">Compare:</property>
<property name="mnemonic-widget">row</property>
</object>
<packing>
@@ -196,10 +196,11 @@
<property name="can-focus">False</property>
<child>
<object class="GtkRadioButton" id="row">
- <property name="label" translatable="yes"
context="duplicaterecordsdialog|row">By _Row</property>
+ <property name="label" translatable="yes"
context="duplicaterecordsdialog|row">_Rows</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes"
context="duplicaterecordsdialog|row">Compare rows.</property>
<property name="use-underline">True</property>
<property name="active">True</property>
<property name="draw-indicator">True</property>
@@ -212,10 +213,11 @@
</child>
<child>
<object class="GtkRadioButton" id="column">
- <property name="label" translatable="yes"
context="duplicaterecordsdialog|column">By _Column</property>
+ <property name="label" translatable="yes"
context="duplicaterecordsdialog|column">_Columns</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes"
context="duplicaterecordsdialog|column">Compare columns.</property>
<property name="use-underline">True</property>
<property name="active">True</property>
<property name="draw-indicator">True</property>
@@ -243,6 +245,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes"
context="duplicaterecordsdialog|select">Select duplicate records.</property>
<property name="use-underline">True</property>
<property name="active">True</property>
<property name="draw-indicator">True</property>
@@ -259,6 +262,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes"
context="duplicaterecordsdialog|remove">Remove duplicate records.</property>
<property name="use-underline">True</property>
<property name="active">True</property>
<property name="draw-indicator">True</property>
@@ -282,6 +286,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes"
context="duplicaterecordsdialog|includesheaders">Select to exclude the
row/column headers from duplicate comparison.</property>
<property name="use-underline">True</property>
<property name="draw-indicator">True</property>
</object>
@@ -291,12 +296,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="items">
+ <object class="GtkLabel" id="records">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="valign">start</property>
- <property name="label" translatable="yes"
context="duplicaterecordsdialog|items">Items:</property>
+ <property name="label" translatable="yes"
context="duplicaterecordsdialog|records">Records:</property>
<property name="mnemonic-widget">allcheckbtn</property>
</object>
<packing>
@@ -310,6 +315,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes"
context="duplicaterecordsdialog|allcheckbtn">Select/unselect all
records.</property>
<property name="use-underline">True</property>
<property name="draw-indicator">True</property>
</object>
@@ -332,7 +338,7 @@
</child>
<action-widgets>
<action-widget response="-11">helpbutton</action-widget>
- <action-widget response="-5">okaybtn</action-widget>
+ <action-widget response="-5">okbtn</action-widget>
<action-widget response="-6">cancelbtn</action-widget>
</action-widgets>
</object>
