[Libreoffice-commits] core.git: sc/inc sc/qa sc/uiconfig
sc/inc/globstr.hrc |4 ++--
sc/qa/uitest/pageFormat/tdf123508.py |6 +++---
sc/uiconfig/scalc/ui/sheetprintpage.ui |4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit c4f5d456e5801843f00a43afd9c0fa43c412d265
Author: Bogdan B
AuthorDate: Tue Nov 1 21:50:57 2022 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Wed Nov 2 11:13:22 2022 +0100
tdf#134882 Change label in the dialog: 'fit' is replaced with 'shrink'
...because shrink is the only effect of this option to the text.
Change-Id: I63783c05ac92803a6de6581d858590904a9e8275
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142138
Reviewed-by: Adolfo Jayme Barrientos
Tested-by: Adolfo Jayme Barrientos
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index edabc014d7bf..9aaf84c8af7a 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -330,8 +330,8 @@
#define STR_SCATTR_PAGE_PRINTDIR
NC_("STR_SCATTR_PAGE_PRINTDIR", "Print direction")
#define STR_SCATTR_PAGE_FIRSTPAGENO
NC_("STR_SCATTR_PAGE_FIRSTPAGENO", "First page number")
#define STR_SCATTR_PAGE_SCALE NC_("STR_SCATTR_PAGE_SCALE",
"Reduce/enlarge printout")
-#define STR_SCATTR_PAGE_SCALETOPAGES
NC_("STR_SCATTR_PAGE_SCALETOPAGES", "Fit print range(s) on number of pages")
-#define STR_SCATTR_PAGE_SCALETO NC_("STR_SCATTR_PAGE_SCALETO",
"Fit print range(s) to width/height")
+#define STR_SCATTR_PAGE_SCALETOPAGES
NC_("STR_SCATTR_PAGE_SCALETOPAGES", "Shrink print range(s) on number of pages")
+#define STR_SCATTR_PAGE_SCALETO NC_("STR_SCATTR_PAGE_SCALETO",
"Shrink print range(s) to width/height")
#define STR_SCATTR_PAGE_SCALE_WIDTH
NC_("STR_SCATTR_PAGE_SCALE_WIDTH", "Width")
#define STR_SCATTR_PAGE_SCALE_HEIGHT
NC_("STR_SCATTR_PAGE_SCALE_HEIGHT", "Height")
#define STR_SCATTR_PAGE_SCALE_PAGES
NNC_("STR_SCATTR_PAGE_SCALE_PAGES", "One page", "%1 pages")
diff --git a/sc/qa/uitest/pageFormat/tdf123508.py
b/sc/qa/uitest/pageFormat/tdf123508.py
index 041e375a7478..7e1f7e987b45 100644
--- a/sc/qa/uitest/pageFormat/tdf123508.py
+++ b/sc/qa/uitest/pageFormat/tdf123508.py
@@ -23,8 +23,8 @@ class tdf123508(UITestCase):
scalingMode = xDialog.getChild("comboLB_SCALEMODE")
spinEDSCALEPAGEWIDTH = xDialog.getChild("spinED_SCALEPAGEWIDTH")
spinEDSCALEPAGEHEIGHT = xDialog.getChild("spinED_SCALEPAGEHEIGHT")
-#select "Fit print range(s) to width/height" from the scale mode
drop-down list
-select_by_text(scalingMode, "Fit print range(s) to width/height")
+#select "Shrink print range(s) to width/height" from the scale
mode drop-down list
+select_by_text(scalingMode, "Shrink print range(s) to
width/height")
#define a value for the page, e.g.: width 2; height 2
spinEDSCALEPAGEWIDTH.executeAction("UP", tuple())
spinEDSCALEPAGEHEIGHT.executeAction("UP", tuple())
@@ -38,7 +38,7 @@ class tdf123508(UITestCase):
spinEDSCALEPAGEWIDTH = xDialog.getChild("spinED_SCALEPAGEWIDTH")
spinEDSCALEPAGEHEIGHT = xDialog.getChild("spinED_SCALEPAGEHEIGHT")
-
self.assertEqual(get_state_as_dict(scalingMode)["SelectEntryText"], "Fit print
range(s) to width/height")
+
self.assertEqual(get_state_as_dict(scalingMode)["SelectEntryText"], "Shrink
print range(s) to width/height")
self.assertEqual(get_state_as_dict(spinEDSCALEPAGEWIDTH)["Text"],
"2")
self.assertEqual(get_state_as_dict(spinEDSCALEPAGEHEIGHT)["Text"],
"2")
diff --git a/sc/uiconfig/scalc/ui/sheetprintpage.ui
b/sc/uiconfig/scalc/ui/sheetprintpage.ui
index 41ee7c089d2d..082457ba5747 100644
--- a/sc/uiconfig/scalc/ui/sheetprintpage.ui
+++ b/sc/uiconfig/scalc/ui/sheetprintpage.ui
@@ -642,8 +642,8 @@
False
Reduce/enlarge printout
- Fit print range(s) to
width/height
- Fit print range(s) on number of
pages
+ Shrink print range(s) to
width/height
+ Shrink print range(s) on number of
pages
[Libreoffice-commits] core.git: sc/inc sc/qa sc/uiconfig
sc/inc/strings.hrc |4 +---
sc/qa/uitest/autofilter/colorfilter.py |4 ++--
sc/uiconfig/scalc/ui/filtersubdropdown.ui|2 +-
sc/uiconfig/scalc/ui/standardfilterdialog.ui |8
4 files changed, 8 insertions(+), 10 deletions(-)
New commits:
commit 126067992d7a2b3edc5dd6ce5e896343da537589
Author: Gabor Kelemen
AuthorDate: Thu Jul 14 19:05:34 2022 +0200
Commit: Gabor Kelemen
CommitDate: Fri Jul 15 10:29:38 2022 +0200
tdf#148248 Text Color -> Font Color in AutoFilter/Standard Filter
Consistently with other places such as Formatting toolbar
and Format Cells -> Font Effects tab page
Change-Id: I7ec5733f01182b25b5d823a43a3639b21ee874e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137087
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index 5e9c82592e68..9f9dfb454502 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -38,10 +38,8 @@
#define SCSTR_FILTER_NOTEMPTY
NC_("SCSTR_FILTER_NOTEMPTY", "Not Empty")
#define SCSTR_FILTER_COLOR NC_("SCSTR_FILTER_COLOR",
"Filter by Color")
#define SCSTR_FILTER_CONDITION
NC_("SCSTR_FILTER_CONDITION", "Filter by Condition")
-#define SCSTR_FILTER_TEXT_COLOR
NC_("SCSTR_FILTER_TEXT_COLOR", "Text Color")
-#define SCSTR_FILTER_BACKGROUND_COLOR
NC_("SCSTR_FILTER_BACKGROUND_COLOR", "Background Color")
// This must match the translation of the same strings of
standardfilterdialog|cond
-#define SCSTR_FILTER_TEXT_COLOR_COND
NC_("STANDARDFILTERDIALOG_COND", "Text color")
+#define SCSTR_FILTER_TEXT_COLOR_COND
NC_("STANDARDFILTERDIALOG_COND", "Font color")
#define SCSTR_FILTER_BACKGROUND_COLOR_COND
NC_("STANDARDFILTERDIALOG_COND", "Background color")
#define SCSTR_FILTER_NO_FILL
NC_("SCSTR_FILTER_NO_FILL", "No Fill")
#define SCSTR_FILTER_AUTOMATIC_COLOR
NC_("SCSTR_FILTER_AUTOMATIC_COLOR", "Automatic")
diff --git a/sc/qa/uitest/autofilter/colorfilter.py
b/sc/qa/uitest/autofilter/colorfilter.py
index 58f39227ee3d..967b17e36d6a 100644
--- a/sc/qa/uitest/autofilter/colorfilter.py
+++ b/sc/qa/uitest/autofilter/colorfilter.py
@@ -36,9 +36,9 @@ class ColorFilterTest(UITestCase):
xCond1 = xDialog.getChild("cond1")
# tdf#143103: Without the fix in place, this test would have
failed with
-# AssertionError: 'Text color' != ''
+# AssertionError: 'Font color' != ''
self.assertEqual("Text color",
get_state_as_dict(xField1)['DisplayText'])
-self.assertEqual("Text color",
get_state_as_dict(xCond1)['DisplayText'])
+self.assertEqual("Font color",
get_state_as_dict(xCond1)['DisplayText'])
xColor1 = xDialog.getChild("color1")
diff --git a/sc/uiconfig/scalc/ui/filtersubdropdown.ui
b/sc/uiconfig/scalc/ui/filtersubdropdown.ui
index d2e3c4a01dd9..e76388f95124 100644
--- a/sc/uiconfig/scalc/ui/filtersubdropdown.ui
+++ b/sc/uiconfig/scalc/ui/filtersubdropdown.ui
@@ -202,7 +202,7 @@
-Text Color
+Font Color
diff --git a/sc/uiconfig/scalc/ui/standardfilterdialog.ui
b/sc/uiconfig/scalc/ui/standardfilterdialog.ui
index 359273e11ff7..bfa9c1e668c7 100644
--- a/sc/uiconfig/scalc/ui/standardfilterdialog.ui
+++ b/sc/uiconfig/scalc/ui/standardfilterdialog.ui
@@ -430,7 +430,7 @@
Does not begin with
Ends with
Does not end with
- Text color
+ Font color
Background color
@@ -469,7 +469,7 @@
Does not begin with
Ends with
Does not end with
- Text color
+ Font color
Background color
@@ -508,7 +508,7 @@
Does not begin with
Ends with
Does not end with
- Text color
+ Font color
Background color
@@ -547,7 +547,7 @@
Does not begin with
Ends with
Does not end wi
[Libreoffice-commits] core.git: sc/inc sc/qa sc/uiconfig
sc/inc/globstr.hrc | 38 +++
sc/qa/uitest/calc_tests3/tdf62267.py |4 +-
sc/qa/uitest/calc_tests4/tdf86253.py |2 -
sc/uiconfig/scalc/ui/conditionalentry.ui | 50 +++
4 files changed, 47 insertions(+), 47 deletions(-)
New commits:
commit 97e14560e4b741c5eec027eced44f8f286d5523c
Author: ayhanyalcinsoy
AuthorDate: Thu Mar 5 11:49:11 2020 +0300
Commit: Eike Rathke
CommitDate: Wed May 27 20:29:50 2020 +0200
tdf#131045:Make condition names grammatically correct
Change-Id: Iae44adc763642632c269d6778b71411be99a68d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90007
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index acb159d4605f..d393739292e5 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -432,30 +432,30 @@
#define STR_ERR_NAME_INVALIDNC_("STR_ERR_NAME_INVALID",
"Invalid name. Only use letters, numbers and underscore.")
#define STR_UNSAVED_EXT_REF NC_("STR_UNSAVED_EXT_REF",
"This Document contains external references to unsaved documents.\n\nDo you
want to continue?")
#define STR_CLOSE_WITH_UNSAVED_REFS
NC_("STR_CLOSE_WITH_UNSAVED_REFS", "This Document is referenced by another
document and not yet saved. Closing it without saving will result in data
loss.")
-#define STR_COND_CONDITION NC_("STR_COND_CONDITION",
"Cell value is")
+#define STR_COND_CONDITION NC_("STR_COND_CONDITION",
"Cell value")
#define STR_COND_COLORSCALE NC_("STR_COND_COLORSCALE",
"ColorScale")
#define STR_COND_DATABARNC_("STR_COND_DATABAR",
"DataBar")
#define STR_COND_ICONSETNC_("STR_COND_ICONSET",
"IconSet")
-#define STR_COND_BETWEENNC_("STR_COND_BETWEEN",
"between")
-#define STR_COND_NOTBETWEEN NC_("STR_COND_NOTBETWEEN",
"not between")
-#define STR_COND_UNIQUE NC_("STR_COND_UNIQUE",
"unique")
-#define STR_COND_DUPLICATE NC_("STR_COND_DUPLICATE",
"duplicate")
+#define STR_COND_BETWEENNC_("STR_COND_BETWEEN", "is
between")
+#define STR_COND_NOTBETWEEN NC_("STR_COND_NOTBETWEEN", "is
not between")
+#define STR_COND_UNIQUE NC_("STR_COND_UNIQUE", "is
unique")
+#define STR_COND_DUPLICATE NC_("STR_COND_DUPLICATE", "is
duplicate")
#define STR_COND_FORMULANC_("STR_COND_FORMULA",
"Formula is")
-#define STR_COND_TOP10 NC_("STR_COND_TOP10", "Top
Elements")
-#define STR_COND_BOTTOM10 NC_("STR_COND_BOTTOM10",
"Bottom Elements")
-#define STR_COND_TOP_PERCENTNC_("STR_COND_TOP_PERCENT",
"Top Percent")
+#define STR_COND_TOP10 NC_("STR_COND_TOP10", "is in
top elements")
+#define STR_COND_BOTTOM10 NC_("STR_COND_BOTTOM10", "is
in bottom elements")
+#define STR_COND_TOP_PERCENTNC_("STR_COND_TOP_PERCENT",
"is in top percent")
#define STR_COND_DATE NC_("STR_COND_DATE", "Date is")
-#define STR_COND_BOTTOM_PERCENT NC_("STR_COND_BOTTOM_PERCENT",
"Bottom Percent")
-#define STR_COND_ABOVE_AVERAGE NC_("STR_COND_ABOVE_AVERAGE",
"Above Average")
-#define STR_COND_BELOW_AVERAGE NC_("STR_COND_BELOW_AVERAGE",
"Below Average")
-#define STR_COND_ABOVE_EQUAL_AVERAGE
NC_("STR_COND_ABOVE_EQUAL_AVERAGE", "Above or equal Average")
-#define STR_COND_BELOW_EQUAL_AVERAGE
NC_("STR_COND_BELOW_EQUAL_AVERAGE", "Below or equal Average")
-#define STR_COND_ERROR NC_("STR_COND_ERROR", "an
Error code")
-#define STR_COND_NOERRORNC_("STR_COND_NOERROR", "not
an Error code")
-#define STR_COND_BEGINS_WITHNC_("STR_COND_BEGINS_WITH",
"Begins with")
-#define STR_COND_ENDS_WITH NC_("STR_COND_ENDS_WITH",
"Ends with")
-#define STR_COND_CONTAINS NC_("STR_COND_CONTAINS",
"Contains")
-#define STR_COND_NOT_CONTAINS NC_("STR_COND_NOT_CONTAINS",
"Not Contains")
+#define STR_COND_BOTTOM_PERCENT NC_("STR_COND_BOTTOM_PERCENT",
"is in bottom percent")
+#define STR_COND_ABOVE_AVERAGE NC_("STR_COND_ABOVE_AVERAGE",
"is above average")
+#define STR_COND_BELOW_AVERAGE NC_("STR_COND_BELOW_AVERAGE",
"is below average")
+#define STR_COND_ABOVE_EQUAL_AVERAGE
NC_("STR_COND_ABOVE_EQUAL_AVERAGE", "is above or equal average")
+#define STR_COND_BELOW_EQUAL_AVERAGE
NC_("STR_COND_BELOW_EQUAL_AVERAGE", "is below or equal average")
+#define STR_COND_ERROR NC_("STR_COND_ERROR", "is a
