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 <erack@redhat.com>
(cherry picked from commit 45161cc173c3217d79ba285c625851eefce3b8df)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94958
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index acb159d..d393739 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -432,30 +432,30 @@
#define STR_ERR_NAME_INVALID NC_("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_DATABAR NC_("STR_COND_DATABAR", "DataBar")
#define STR_COND_ICONSET NC_("STR_COND_ICONSET", "IconSet")
#define STR_COND_BETWEEN NC_("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_BETWEEN NC_("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_FORMULA NC_("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_PERCENT NC_("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_PERCENT NC_("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_NOERROR NC_("STR_COND_NOERROR", "not an Error code")
#define STR_COND_BEGINS_WITH NC_("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 an error code")
#define STR_COND_NOERROR NC_("STR_COND_NOERROR", "is not an error code")
#define STR_COND_BEGINS_WITH NC_("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", "does not contain")
#define STR_COND_TODAY NC_("STR_COND_TODAY", "today")
#define STR_COND_YESTERDAY NC_("STR_COND_YESTERDAY", "yesterday")
#define STR_COND_TOMORROW NC_("STR_COND_TOMORROW", "tomorrow")
diff --git a/sc/qa/uitest/calc_tests3/tdf62267.py b/sc/qa/uitest/calc_tests3/tdf62267.py
index 5671028..3d1f0e0 100644
--- a/sc/qa/uitest/calc_tests3/tdf62267.py
+++ b/sc/qa/uitest/calc_tests3/tdf62267.py
@@ -50,11 +50,11 @@ class tdf62267(UITestCase):
self.assertEqual(list_state['Children'], '1')
xTreeEntry = xList.getChild('0')
self.assertEqual(get_state_as_dict(xTreeEntry)["Text"], "A1\tCell value is = 1")
self.assertEqual(get_state_as_dict(xTreeEntry)["Text"], "A1\tCell value = 1")
xCancelBtn = xCondFormatMgr.getChild("cancel")
self.ui_test.close_dialog_through_button(xCancelBtn)
self.ui_test.close_doc()
# vim: set shiftwidth=4 softtabstop=4 expandtab:
\ No newline at end of file
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/calc_tests4/tdf86253.py b/sc/qa/uitest/calc_tests4/tdf86253.py
index c9c512c..9e801f8 100644
--- a/sc/qa/uitest/calc_tests4/tdf86253.py
+++ b/sc/qa/uitest/calc_tests4/tdf86253.py
@@ -57,7 +57,7 @@ class tdf86253(UITestCase):
self.assertEqual(list_state['Children'], '1')
xTreeEntry = xList.getChild('0')
self.assertEqual(get_state_as_dict(xTreeEntry)["Text"], "A1:A6,C1:C17\tCell value is >= 0")
self.assertEqual(get_state_as_dict(xTreeEntry)["Text"], "A1:A6,C1:C17\tCell value >= 0")
xCancelBtn = xCondFormatMgr.getChild("cancel")
self.ui_test.close_dialog_through_button(xCancelBtn)
diff --git a/sc/uiconfig/scalc/ui/conditionalentry.ui b/sc/uiconfig/scalc/ui/conditionalentry.ui
index 8513487..67d1eb9 100644
--- a/sc/uiconfig/scalc/ui/conditionalentry.ui
+++ b/sc/uiconfig/scalc/ui/conditionalentry.ui
@@ -371,30 +371,30 @@
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<items>
<item translatable="yes" context="conditionalentry|typeis">equal to</item>
<item translatable="yes" context="conditionalentry|typeis">less than</item>
<item translatable="yes" context="conditionalentry|typeis">greater than</item>
<item translatable="yes" context="conditionalentry|typeis">less than or equal to</item>
<item translatable="yes" context="conditionalentry|typeis">greater than or equal to</item>
<item translatable="yes" context="conditionalentry|typeis">not equal to</item>
<item translatable="yes" context="conditionalentry|typeis">between</item>
<item translatable="yes" context="conditionalentry|typeis">not between</item>
<item translatable="yes" context="conditionalentry|typeis">duplicate</item>
<item translatable="yes" context="conditionalentry|typeis">not duplicate</item>
<item translatable="yes" context="conditionalentry|typeis">top N elements</item>
<item translatable="yes" context="conditionalentry|typeis">bottom N elements</item>
<item translatable="yes" context="conditionalentry|typeis">top N percent</item>
<item translatable="yes" context="conditionalentry|typeis">bottom N percent</item>
<item translatable="yes" context="conditionalentry|typeis">above average</item>
<item translatable="yes" context="conditionalentry|typeis">below average</item>
<item translatable="yes" context="conditionalentry|typeis">above or equal average</item>
<item translatable="yes" context="conditionalentry|typeis">below or equal average</item>
<item translatable="yes" context="conditionalentry|typeis">Error</item>
<item translatable="yes" context="conditionalentry|typeis">No Error</item>
<item translatable="yes" context="conditionalentry|typeis">Begins with</item>
<item translatable="yes" context="conditionalentry|typeis">Ends with</item>
<item translatable="yes" context="conditionalentry|typeis">Contains</item>
<item translatable="yes" context="conditionalentry|typeis">Not Contains</item>
<item translatable="yes" context="conditionalentry|typeis">is equal to</item>
<item translatable="yes" context="conditionalentry|typeis">is less than</item>
<item translatable="yes" context="conditionalentry|typeis">is greater than</item>
<item translatable="yes" context="conditionalentry|typeis">is less than or equal to</item>
<item translatable="yes" context="conditionalentry|typeis">is greater than or equal to</item>
<item translatable="yes" context="conditionalentry|typeis">is not equal to</item>
<item translatable="yes" context="conditionalentry|typeis">is between</item>
<item translatable="yes" context="conditionalentry|typeis">is not between</item>
<item translatable="yes" context="conditionalentry|typeis">is duplicate</item>
<item translatable="yes" context="conditionalentry|typeis">is not duplicate</item>
<item translatable="yes" context="conditionalentry|typeis">is in top N elements</item>
<item translatable="yes" context="conditionalentry|typeis">is in bottom N elements</item>
<item translatable="yes" context="conditionalentry|typeis">is in top N percent</item>
<item translatable="yes" context="conditionalentry|typeis">is in bottom N percent</item>
<item translatable="yes" context="conditionalentry|typeis">is above average</item>
<item translatable="yes" context="conditionalentry|typeis">is below average</item>
<item translatable="yes" context="conditionalentry|typeis">is above or equal average</item>
<item translatable="yes" context="conditionalentry|typeis">is below or equal average</item>
<item translatable="yes" context="conditionalentry|typeis">is error</item>
<item translatable="yes" context="conditionalentry|typeis">is not error</item>
<item translatable="yes" context="conditionalentry|typeis">begins with</item>
<item translatable="yes" context="conditionalentry|typeis">ends with</item>
<item translatable="yes" context="conditionalentry|typeis">contains</item>
<item translatable="yes" context="conditionalentry|typeis">does not contain</item>
</items>
</object>
<packing>
@@ -459,7 +459,7 @@
<property name="can_focus">False</property>
<items>
<item translatable="yes" context="conditionalentry|type">All Cells</item>
<item translatable="yes" context="conditionalentry|type">Cell value is</item>
<item translatable="yes" context="conditionalentry|type">Cell value</item>
<item translatable="yes" context="conditionalentry|type">Formula is</item>
<item translatable="yes" context="conditionalentry|type">Date is</item>
</items>
