ooo-build r11203 - in trunk: . scratch/scsolver/ext scratch/scsolver/ext/translation/en-US scratch/scsolver/source/ui

[kyoshida svn gnome org]

Author: kyoshida
Date: Sun Jan  6 19:28:52 2008
New Revision: 11203
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11203&view=rev

Log:
2008-01-06  Kohei Yoshida  <kyoshida novell com>

	* scratch/scsolver/ext/configure.ac: adjusted the root directory path to
	scsolver from ext.
	
	* scratch/scsolver/ext/translation/en-US/scsolver.properties: localized
	two previously-hardcoded strings.
	
	* scratch/scsolver/source/ui/resmgr.cxx: added two new mapping entries.


Modified:
   trunk/ChangeLog
   trunk/scratch/scsolver/ext/configure.ac
   trunk/scratch/scsolver/ext/translation/en-US/scsolver.properties
   trunk/scratch/scsolver/source/ui/resmgr.cxx

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	(original)
+++ trunk/ChangeLog	Sun Jan  6 19:28:52 2008
@@ -1,5 +1,15 @@
 2008-01-06  Kohei Yoshida  <kyoshida novell com>
 
+	* scratch/scsolver/ext/configure.ac: adjusted the root directory path to
+	scsolver from ext.
+	
+	* scratch/scsolver/ext/translation/en-US/scsolver.properties: localized
+	two previously-hardcoded strings.
+	
+	* scratch/scsolver/source/ui/resmgr.cxx: added two new mapping entries.
+
+2008-01-06  Kohei Yoshida  <kyoshida novell com>
+
 	* scratch/scsolver/ext/translation/en-US/scsolver.properties: 'Define
 	Model' to 'Model'.
 	

Modified: trunk/scratch/scsolver/ext/configure.ac
==============================================================================
--- trunk/scratch/scsolver/ext/configure.ac	(original)
+++ trunk/scratch/scsolver/ext/configure.ac	Sun Jan  6 19:28:52 2008
@@ -39,7 +39,7 @@
    [AC_MSG_ERROR(boost/numeric/ublas/matrix.hpp not found. install boost)], [])
 AC_LANG_RESTORE
 
-SCSOLVERDIR=../..
+SCSOLVERDIR=..
 AC_SUBST(SCSOLVERDIR)
 
 OBJDIR=./obj

Modified: trunk/scratch/scsolver/ext/translation/en-US/scsolver.properties
==============================================================================
--- trunk/scratch/scsolver/ext/translation/en-US/scsolver.properties	(original)
+++ trunk/scratch/scsolver/ext/translation/en-US/scsolver.properties	Sun Jan  6 19:28:52 2008
@@ -51,4 +51,6 @@
 107.Common.StdException.Label=Standard exception caught
 111.Common.IterationTimedOut.Label=Iteration timed out
 115.Common.GoalNotSet.Label=Goal is not set
+119.Common.TargetNotSet.Label=Target cell address empty
+123.Common.DecisionNotSet.Label=Decision variable cells empty
 

Modified: trunk/scratch/scsolver/source/ui/resmgr.cxx
==============================================================================
--- trunk/scratch/scsolver/source/ui/resmgr.cxx	(original)
+++ trunk/scratch/scsolver/source/ui/resmgr.cxx	Sun Jan  6 19:28:52 2008
@@ -304,7 +304,11 @@
         // SCSOLVER_STR_OPTION_VAR_POSITIVE
         ascii("OptionDialog.cbPositiveValue.Label"),
         // SCSOLVER_STR_OPTION_VAR_INTEGER
-        ascii("OptionDialog.cbIntegerValue.Label")
+        ascii("OptionDialog.cbIntegerValue.Label"),
+        // SCSOLVER_STR_TARGET_NOT_SET
+        ascii("Common.TargetNotSet.Label"),
+        // SCSOLVER_STR_DECISIONVAR_NOT_SET
+        ascii("Common.DecisionNotSet.Label")
     };
 
     if (resid - SCSOLVER_RES_START >= sizeof(resNameList)/sizeof(resNameList[0]))