[Libreoffice-commits] core.git: 2 commits - sc/source
Eike Rathke
erack at redhat.com
Thu Aug 15 10:20:29 PDT 2013
sc/source/ui/src/scfuncs.src | 308 +++++++++++++++++++++----------------------
1 file changed, 154 insertions(+), 154 deletions(-)
New commits:
commit bae4f0448349e86202977bba8f12f8fed16148cc
Author: Eike Rathke <erack at redhat.com>
Date: Thu Aug 15 19:14:20 2013 +0200
corrected description strings of 'criteria'
Criteria in SUMIF, AVERAGEIF, COUNTIF, SUMIFS, AVERAGEIFS, COUNTIFS are
not cell ranges.
Change-Id: Iace25057ab3c9af1e2ec3c45c6803d42272f962b
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 6df56c9..64ef65c 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -2985,7 +2985,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
};
String 5 // Description of Parameter 2
{
- Text [ en-US ] = "The cell range in which the search criteria are given." ;
+ Text [ en-US ] = "The criteria to be applied to the range." ;
};
String 6 // Name of Parameter 3
{
@@ -3026,7 +3026,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
};
String 5 // Description of Parameter 2
{
- Text [ en-US ] = "The cell range in which the search criteria are given." ;
+ Text [ en-US ] = "The criteria to be applied to the range." ;
};
String 6 // Name of Parameter 3
{
@@ -3074,7 +3074,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
};
String 7 // Description of Parameter 3
{
- Text [ en-US ] = "Criteria 1, criteria 2,... are the cell ranges in which the search criteria are given." ;
+ Text [ en-US ] = "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given." ;
};
};
@@ -3115,7 +3115,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
};
String 7 // Description of Parameter 3
{
- Text [ en-US ] = "Criteria 1, criteria 2,... are the cell ranges in which the search criteria are given." ;
+ Text [ en-US ] = "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given." ;
};
};
@@ -3148,7 +3148,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
};
String 5 // Description of Parameter 2
{
- Text [ en-US ] = "Criteria 1, criteria 2,... are the cell ranges in which the search criteria are given." ;
+ Text [ en-US ] = "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given." ;
};
};
@@ -3173,7 +3173,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
};
String 3 // Description of Parameter 1
{
- Text [ en-US ] = "The range of cells on which the criteria are to be applied." ;
+ Text [ en-US ] = "The range of cells to be evaluated by the criteria given." ;
};
String 4 // Name of Parameter 2
{
@@ -3181,7 +3181,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
};
String 5 // Description of Parameter 2
{
- Text [ en-US ] = "The cell range in which the search criteria are given." ;
+ Text [ en-US ] = "The criteria to be applied to the range." ;
};
};
// -=*# Resource for function WURZEL #*=-
commit 70c213f3f643c9eb730f4580346132a47af466b3
Author: Eike Rathke <erack at redhat.com>
Date: Thu Aug 15 19:08:43 2013 +0200
get rid of tabs from merge
Change-Id: I39e41abc17979f6b84b787d1078de05475ea8a62
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 78d6cfa..6df56c9 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -2997,160 +2997,160 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
};
};
- // -=*# Resource for function AVERAGEIF #*=-
- Resource SC_OPCODE_AVERAGE_IF
- {
- String 1 // Description
- {
- Text [ en-US ] = "Averages the arguments that meet the conditions." ;
- };
- ExtraData =
- {
- 0;
- ID_FUNCTION_GRP_MATH;
- U2S( HID_FUNC_AVERAGEIF );
- 3; 0; 0; 1;
- 0;
- };
- String 2 // Name of Parameter 1
- {
- Text [ en-US ] = "range" ;
- };
- String 3 // Description of Parameter 1
- {
- Text [ en-US ] = "The range to be evaluated by the criteria given." ;
- };
- String 4 // Name of Parameter 2
- {
- Text [ en-US ] = "criteria" ;
- };
- String 5 // Description of Parameter 2
- {
- Text [ en-US ] = "The cell range in which the search criteria are given." ;
- };
- String 6 // Name of Parameter 3
- {
- Text [ en-US ] = "average_range" ;
- };
- String 7 // Description of Parameter 3
- {
- Text [ en-US ] = "The range from which the values are to be averaged." ;
- };
- };
+ // -=*# Resource for function AVERAGEIF #*=-
+ Resource SC_OPCODE_AVERAGE_IF
+ {
+ String 1 // Description
+ {
+ Text [ en-US ] = "Averages the arguments that meet the conditions." ;
+ };
+ ExtraData =
+ {
+ 0;
+ ID_FUNCTION_GRP_MATH;
+ U2S( HID_FUNC_AVERAGEIF );
+ 3; 0; 0; 1;
+ 0;
+ };
+ String 2 // Name of Parameter 1
+ {
+ Text [ en-US ] = "range" ;
+ };
+ String 3 // Description of Parameter 1
+ {
+ Text [ en-US ] = "The range to be evaluated by the criteria given." ;
+ };
+ String 4 // Name of Parameter 2
+ {
+ Text [ en-US ] = "criteria" ;
+ };
+ String 5 // Description of Parameter 2
+ {
+ Text [ en-US ] = "The cell range in which the search criteria are given." ;
+ };
+ String 6 // Name of Parameter 3
+ {
+ Text [ en-US ] = "average_range" ;
+ };
+ String 7 // Description of Parameter 3
+ {
+ Text [ en-US ] = "The range from which the values are to be averaged." ;
+ };
+ };
- Resource SC_OPCODE_SUM_IFS
- {
- String 1 // Description
- {
- Text [ en-US ] = "Totals the values of cells in a range that meet multiple criteria in multiple ranges." ;
- };
- ExtraData =
- {
- 0;
- ID_FUNCTION_GRP_MATH;
- U2S( HID_FUNC_SUMIFS );
- PAIRED_VAR_ARGS+1; 0; 0; 0;
- 0;
- };
- String 2 // Name of Parameter 1
- {
- Text [ en-US ] = "sum_range" ;
- };
- String 3 // Description of Parameter 1
- {
- Text [ en-US ] = "The range from which the values are to be totalled." ;
- };
- String 4 // Name of Parameter 2
- {
- Text [ en-US ] = "range " ;
- };
- String 5 // Description of Parameter 2
- {
- Text [ en-US ] = "Range 1, range 2,... are the ranges to be evaluated by the criteria given." ;
- };
- String 6 // Name of Parameter 3
- {
- Text [ en-US ] = "criteria " ;
- };
- String 7 // Description of Parameter 3
- {
- Text [ en-US ] = "Criteria 1, criteria 2,... are the cell ranges in which the search criteria are given." ;
- };
- };
+ Resource SC_OPCODE_SUM_IFS
+ {
+ String 1 // Description
+ {
+ Text [ en-US ] = "Totals the values of cells in a range that meet multiple criteria in multiple ranges." ;
+ };
+ ExtraData =
+ {
+ 0;
+ ID_FUNCTION_GRP_MATH;
+ U2S( HID_FUNC_SUMIFS );
+ PAIRED_VAR_ARGS+1; 0; 0; 0;
+ 0;
+ };
+ String 2 // Name of Parameter 1
+ {
+ Text [ en-US ] = "sum_range" ;
+ };
+ String 3 // Description of Parameter 1
+ {
+ Text [ en-US ] = "The range from which the values are to be totalled." ;
+ };
+ String 4 // Name of Parameter 2
+ {
+ Text [ en-US ] = "range " ;
+ };
+ String 5 // Description of Parameter 2
+ {
+ Text [ en-US ] = "Range 1, range 2,... are the ranges to be evaluated by the criteria given." ;
+ };
+ String 6 // Name of Parameter 3
+ {
+ Text [ en-US ] = "criteria " ;
+ };
+ String 7 // Description of Parameter 3
+ {
+ Text [ en-US ] = "Criteria 1, criteria 2,... are the cell ranges in which the search criteria are given." ;
+ };
+ };
- // -=*# Resource for function AVERAGEIFS #*=-
- Resource SC_OPCODE_AVERAGE_IFS
- {
- String 1 // Description
- {
- Text [ en-US ] = "Averages the value of the cells that meet multiple criteria in multiple ranges." ;
- };
- ExtraData =
- {
- 0;
- ID_FUNCTION_GRP_MATH;
- U2S( HID_FUNC_AVERAGEIFS );
- PAIRED_VAR_ARGS+1; 0; 0; 0;
- 0;
- };
- String 2 // Name of Parameter 1
- {
- Text [ en-US ] = "average_range" ;
- };
- String 3 // Description of Parameter 1
- {
- Text [ en-US ] = "The range from which the values are to be averaged." ;
- };
- String 4 // Name of Parameter 2
- {
- Text [ en-US ] = "range " ;
- };
- String 5 // Description of Parameter 2
- {
- Text [ en-US ] = "Range 1, range 2,... are the ranges to be evaluated by the criteria given." ;
- };
- String 6 // Name of Parameter 3
- {
- Text [ en-US ] = "criteria " ;
- };
- String 7 // Description of Parameter 3
- {
- Text [ en-US ] = "Criteria 1, criteria 2,... are the cell ranges in which the search criteria are given." ;
- };
- };
+ // -=*# Resource for function AVERAGEIFS #*=-
+ Resource SC_OPCODE_AVERAGE_IFS
+ {
+ String 1 // Description
+ {
+ Text [ en-US ] = "Averages the value of the cells that meet multiple criteria in multiple ranges." ;
+ };
+ ExtraData =
+ {
+ 0;
+ ID_FUNCTION_GRP_MATH;
+ U2S( HID_FUNC_AVERAGEIFS );
+ PAIRED_VAR_ARGS+1; 0; 0; 0;
+ 0;
+ };
+ String 2 // Name of Parameter 1
+ {
+ Text [ en-US ] = "average_range" ;
+ };
+ String 3 // Description of Parameter 1
+ {
+ Text [ en-US ] = "The range from which the values are to be averaged." ;
+ };
+ String 4 // Name of Parameter 2
+ {
+ Text [ en-US ] = "range " ;
+ };
+ String 5 // Description of Parameter 2
+ {
+ Text [ en-US ] = "Range 1, range 2,... are the ranges to be evaluated by the criteria given." ;
+ };
+ String 6 // Name of Parameter 3
+ {
+ Text [ en-US ] = "criteria " ;
+ };
+ String 7 // Description of Parameter 3
+ {
+ Text [ en-US ] = "Criteria 1, criteria 2,... are the cell ranges in which the search criteria are given." ;
+ };
+ };
- // -=*# Resource for function COUNTIFS #*=-
- Resource SC_OPCODE_COUNT_IFS
- {
- String 1 // Description
- {
- Text [ en-US ] = "Counts the cells that meet multiple criteria in multiple ranges." ;
- };
- ExtraData =
- {
- 0;
- ID_FUNCTION_GRP_MATH;
- U2S( HID_FUNC_COUNTIFS );
- PAIRED_VAR_ARGS; 0; 0;
- 0;
- };
- String 2 // Name of Parameter 1
- {
- Text [ en-US ] = "range " ;
- };
- String 3 // Description of Parameter 1
- {
- Text [ en-US ] = "Range 1, range 2,... are the ranges to be evaluated by the criteria given." ;
- };
- String 4 // Name of Parameter 2
- {
- Text [ en-US ] = "criteria " ;
- };
- String 5 // Description of Parameter 2
- {
- Text [ en-US ] = "Criteria 1, criteria 2,... are the cell ranges in which the search criteria are given." ;
- };
- };
+ // -=*# Resource for function COUNTIFS #*=-
+ Resource SC_OPCODE_COUNT_IFS
+ {
+ String 1 // Description
+ {
+ Text [ en-US ] = "Counts the cells that meet multiple criteria in multiple ranges." ;
+ };
+ ExtraData =
+ {
+ 0;
+ ID_FUNCTION_GRP_MATH;
+ U2S( HID_FUNC_COUNTIFS );
+ PAIRED_VAR_ARGS; 0; 0;
+ 0;
+ };
+ String 2 // Name of Parameter 1
+ {
+ Text [ en-US ] = "range " ;
+ };
+ String 3 // Description of Parameter 1
+ {
+ Text [ en-US ] = "Range 1, range 2,... are the ranges to be evaluated by the criteria given." ;
+ };
+ String 4 // Name of Parameter 2
+ {
+ Text [ en-US ] = "criteria " ;
+ };
+ String 5 // Description of Parameter 2
+ {
+ Text [ en-US ] = "Criteria 1, criteria 2,... are the cell ranges in which the search criteria are given." ;
+ };
+ };
// -=*# Resource for function ZÄHLENWENN #*=-
Resource SC_OPCODE_COUNT_IF
More information about the Libreoffice-commits
mailing list