[gnumeric] fix hlookup description, data labels in exp smoothing

[Andreas J. Guelzow <guelzow src gnome org>]

commit 205e5448e80e327291084408e8b20fb334bafac1
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Wed Nov 24 12:04:19 2010 -0700

    fix hlookup description, data labels in exp smoothing
    
    2010-11-24  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* plugins/fn-lookup/functions.c (help_vlookup): fix fn_note
    	(help_hlookup): fix description
    
    2010-11-24 Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* analysis-exp-smoothing.c
    	(analysis_tool_exponential_smoothing_engine_ses_h_run): fix data label
    	(analysis_tool_exponential_smoothing_engine_ses_r_run): ditto
    	(analysis_tool_exponential_smoothing_engine_des_run): ditto
    	(analysis_tool_exponential_smoothing_engine_ates_run): ditto
    	(analysis_tool_exponential_smoothing_engine_mtes_run): ditto

 plugins/fn-lookup/ChangeLog        |    5 +++++
 plugins/fn-lookup/functions.c      |   12 ++++++------
 src/tools/ChangeLog                |    9 +++++++++
 src/tools/analysis-exp-smoothing.c |   15 ++++++++++-----
 4 files changed, 30 insertions(+), 11 deletions(-)
---
diff --git a/plugins/fn-lookup/ChangeLog b/plugins/fn-lookup/ChangeLog
index f7b10fa..5dcc962 100644
--- a/plugins/fn-lookup/ChangeLog
+++ b/plugins/fn-lookup/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-24  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* plugins/fn-lookup/functions.c (help_vlookup): fix fn_note
+	(help_hlookup): fix description 
+
 2010-10-01  Morten Welinder <terra gnome org>
 
 	* Release 1.10.11
diff --git a/plugins/fn-lookup/functions.c b/plugins/fn-lookup/functions.c
index 34b1c57..1cec621 100644
--- a/plugins/fn-lookup/functions.c
+++ b/plugins/fn-lookup/functions.c
@@ -928,7 +928,7 @@ static GnmFuncHelp const help_vlookup[] = {
 					"is returned.")},
 	{ GNM_FUNC_HELP_NOTE, F_("If @{approximate} is true, "
 				 "then the values must be sorted in order of ascending value.")},
-	{ GNM_FUNC_HELP_NOTE, F_("VLOOKUP returns #REF! if @{row} falls outside @{range}.")},
+	{ GNM_FUNC_HELP_NOTE, F_("VLOOKUP returns #REF! if @{column} falls outside @{range}.")},
         { GNM_FUNC_HELP_SEEALSO, "HLOOKUP"},
         { GNM_FUNC_HELP_END}
 };
@@ -975,17 +975,17 @@ static GnmFuncHelp const help_hlookup[] = {
 	{ GNM_FUNC_HELP_NAME, F_("HLOOKUP:search the first row of @{range} for @{value}")},
         { GNM_FUNC_HELP_ARG, F_("value:search value")},
         { GNM_FUNC_HELP_ARG, F_("range:range to search")},
-        { GNM_FUNC_HELP_ARG, F_("row:1-based column offset indicating the return values ")},
+        { GNM_FUNC_HELP_ARG, F_("row:1-based row offset indicating the return values ")},
         { GNM_FUNC_HELP_ARG, F_("approximate:if false, an exact match of @{value} "
 				"must be found; defaults to TRUE")},
-        { GNM_FUNC_HELP_ARG, F_("as_index:if true, the 0-based row offset is "
+        { GNM_FUNC_HELP_ARG, F_("as_index:if true, the 0-based column offset is "
 				"returned; defaults to FALSE")},
 	{ GNM_FUNC_HELP_DESCRIPTION, F_("HLOOKUP function finds the row in @{range} that has a first "
 					"cell similar to @{value}.  If @{approximate} is not true it "
-					"finds the row with an exact equality. If @{approximate} is "
-					"true, it finds the last row with first value less than or "
+					"finds the column with an exact equality. If @{approximate} is "
+					"true, it finds the last column with first value less than or "
 					"equal to "
-					"@{value}. If @{as_index} is true the 0-based row offset "
+					"@{value}. If @{as_index} is true the 0-based column offset "
 					"is returned.")},
 	{ GNM_FUNC_HELP_NOTE, F_("If @{approximate} is true, "
 				 "then the values must be sorted in order of ascending value.")},
diff --git a/src/tools/ChangeLog b/src/tools/ChangeLog
index 30d2efb..2f66199 100644
--- a/src/tools/ChangeLog
+++ b/src/tools/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-24 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* analysis-exp-smoothing.c 
+	(analysis_tool_exponential_smoothing_engine_ses_h_run): fix data label
+	(analysis_tool_exponential_smoothing_engine_ses_r_run): ditto
+	(analysis_tool_exponential_smoothing_engine_des_run): ditto
+	(analysis_tool_exponential_smoothing_engine_ates_run): ditto
+	(analysis_tool_exponential_smoothing_engine_mtes_run): ditto
+	
 2010-11-04  Morten Welinder  <terra gnome org>
 
 	* dao.c (dao_convert_to_values): Use sheet_foreach_cell_in_range
diff --git a/src/tools/analysis-exp-smoothing.c b/src/tools/analysis-exp-smoothing.c
index 73dc13c..58fed9e 100644
--- a/src/tools/analysis-exp-smoothing.c
+++ b/src/tools/analysis-exp-smoothing.c
@@ -149,7 +149,8 @@ analysis_tool_exponential_smoothing_engine_ses_h_run (data_analysis_output_t *da
 		} else
 			dao_set_cell_printf
 				(dao, col, 0,
-				 (info->base.group_by ? _("Row %d") : _("Column %d")),
+				 (info->base.group_by == GROUPED_BY_ROW ? 
+				  _("Row %d") : _("Column %d")),
 				 source);
 
 		switch (info->base.group_by) {
@@ -324,7 +325,8 @@ analysis_tool_exponential_smoothing_engine_ses_r_run (data_analysis_output_t *da
 		} else
 			dao_set_cell_printf
 				(dao, col, 0,
-				 (info->base.group_by ? _("Row %d") : _("Column %d")),
+				 (info->base.group_by == GROUPED_BY_ROW ? 
+				  _("Row %d") : _("Column %d")),
 				 source);
 
 		switch (info->base.group_by) {
@@ -511,7 +513,8 @@ analysis_tool_exponential_smoothing_engine_des_run (data_analysis_output_t *dao,
 		} else
 			dao_set_cell_printf
 				(dao, col, 0,
-				 (info->base.group_by ? _("Row %d") : _("Column %d")),
+				 (info->base.group_by == GROUPED_BY_ROW ? 
+				  _("Row %d") : _("Column %d")),
 				 source);
 
 		switch (info->base.group_by) {
@@ -774,7 +777,8 @@ analysis_tool_exponential_smoothing_engine_ates_run (data_analysis_output_t *dao
 			} else
 				dao_set_cell_printf
 					(dao, col,  -info->s_period,
-					 (info->base.group_by ? _("Row %d") : _("Column %d")),
+					 (info->base.group_by  == GROUPED_BY_ROW ? 
+					  _("Row %d") : _("Column %d")),
 					 source);
 
 
@@ -1095,7 +1099,8 @@ analysis_tool_exponential_smoothing_engine_mtes_run (data_analysis_output_t *dao
 			} else
 				dao_set_cell_printf
 					(dao, col,  -info->s_period,
-					 (info->base.group_by ? _("Row %d") : _("Column %d")),
+					 (info->base.group_by  == GROUPED_BY_ROW ?
+					  _("Row %d") : _("Column %d")),
 					 source);