From 97e14560e4b741c5eec027eced44f8f286d5523c Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Thu, 5 Mar 2020 11:49:11 +0300 Subject: 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 --- 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(-) (limited to 'sc') 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_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 5671028ec5fb..3d1f0e0c83d9 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 c9c512c8d359..9e801f8517a8 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 85134870d0b0..67d1eb99f7b7 100644 --- a/sc/uiconfig/scalc/ui/conditionalentry.ui +++ b/sc/uiconfig/scalc/ui/conditionalentry.ui @@ -371,30 +371,30 @@ False True - equal to - less than - greater than - less than or equal to - greater than or equal to - not equal to - between - not between - duplicate - not duplicate - top N elements - bottom N elements - top N percent - bottom N percent - above average - below average - above or equal average - below or equal average - Error - No Error - Begins with - Ends with - Contains - Not Contains + is equal to + is less than + is greater than + is less than or equal to + is greater than or equal to + is not equal to + is between + is not between + is duplicate + is not duplicate + is in top N elements + is in bottom N elements + is in top N percent + is in bottom N percent + is above average + is below average + is above or equal average + is below or equal average + is error + is not error + begins with + ends with + contains + does not contain @@ -459,7 +459,7 @@ False All Cells - Cell value is + Cell value Formula is Date is -- cgit