[Libreoffice-commits] .: 9 commits - instsetoo_native/util
Petr Mladek
pmladek at kemper.freedesktop.org
Wed Nov 30 05:30:22 PST 2011
instsetoo_native/util/openoffice.lst | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 817bf1d41bb07aeb3ed7649d25c2b44ee4acb1fe
Merge: 0a112ee... 0608cb3...
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Nov 30 14:29:22 2011 +0100
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/core
commit 0a112eecbcbe58d3795a4e14ef56b0f253461a98
Merge: ef91e38... dd750cf...
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Nov 29 18:15:13 2011 +0100
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/core
commit ef91e38681a668cb1c587d59117a83caae51fe32
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Nov 29 17:52:42 2011 +0100
Version 3.5.0.0, tag libreoffice-3.5.0.0 (3.5.0-beta0)
commit da29b0405bc91546f8eaee70303a1c40494e867e
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Nov 29 17:48:30 2011 +0100
bump product version to 3.5.0-beta1, release number stays at 0
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 22a5227..8883713 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -54,7 +54,7 @@ LibreOffice
PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION alpha0
+ SHORT_PRODUCTEXTENSION beta0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
@@ -115,7 +115,7 @@ LibreOffice_wJRE
PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION alpha0
+ SHORT_PRODUCTEXTENSION beta0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
@@ -175,7 +175,7 @@ LibreOffice_Dev
PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION alpha0
+ SHORT_PRODUCTEXTENSION beta0
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
@@ -246,7 +246,7 @@ URE
PRODUCTEXTENSION
BRANDPACKAGEVERSION 3.5
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION alpha0
+ SHORT_PRODUCTEXTENSION beta0
LICENSENAME LGPL
SETSTATICPATH 1
NOVERSIONINDIRNAME 1
@@ -284,7 +284,7 @@ LibreOffice_SDK
PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION alpha0
+ SHORT_PRODUCTEXTENSION beta0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.5
@@ -330,7 +330,7 @@ LibreOffice_Dev_SDK
PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION alpha0
+ SHORT_PRODUCTEXTENSION beta0
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
@@ -381,7 +381,7 @@ OxygenOffice
PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION alpha0
+ SHORT_PRODUCTEXTENSION beta0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
@@ -447,7 +447,7 @@ OxygenOffice_wJRE
PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION alpha0
+ SHORT_PRODUCTEXTENSION beta0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
commit 1aa1b7298c2ea84f27881e3beb6ae7108554876f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Nov 29 10:41:38 2011 +0100
...originally probably replaced an en-dash (thanks Roman Eisele).
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
index e77c972..50666ff 100755
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
@@ -18,7 +18,7 @@
* @References:
* [1] Storn R, Price K. Differential evolution - a simple and efficient
* heuristic for global optimization over continuous spaces. Journal of
- * Global Optimization, 1997, 11: 341 C359
+ * Global Optimization, 1997, 11: 341-359
* @ The original differential evolution idea
* [2] X F Xie, W J Zhang. SWAF: swarm algorithm framework for numerical
* optimization. Genetic and Evolutionary Computation Conference (GECCO),
commit 471a0d741d823077381c2fcb167739755806cf48
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Nov 29 08:37:29 2011 +0100
Replaced UTF-8 U+FFFD with ASCII space in source code comment.
The Unicode replacement character got in there probably during a previous
conversion of the source code; not evident to me what it replaced originally.
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
index cb06936..e77c972 100755
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
@@ -18,7 +18,7 @@
* @References:
* [1] Storn R, Price K. Differential evolution - a simple and efficient
* heuristic for global optimization over continuous spaces. Journal of
- * Global Optimization, 1997, 11: 341�C359
+ * Global Optimization, 1997, 11: 341 C359
* @ The original differential evolution idea
* [2] X F Xie, W J Zhang. SWAF: swarm algorithm framework for numerical
* optimization. Genetic and Evolutionary Computation Conference (GECCO),
commit 93ba2c77a14a1377525d5c382dba26c08527c4ab
Author: Andras Timar <atimar at suse.com>
Date: Mon Nov 28 21:38:05 2011 +0100
remove CR/LF linefeed from description
diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description-en-US.txt b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description-en-US.txt
index 5a9fbed..9288dcf 100755
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description-en-US.txt
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description-en-US.txt
@@ -1,2 +1 @@
-This extension integrates into Calc and offers new Solver engines
-to use for optimizing nonlinear programming models.
\ No newline at end of file
+This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models.
commit 236eebb22eb4eae70f795445a399f2beb25045fd
Author: Andras Timar <atimar at suse.com>
Date: Mon Nov 28 21:35:57 2011 +0100
eliminate duplicate IDs
diff --git a/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp b/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp
index bbe5888..af4ecd4 100755
--- a/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp
+++ b/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp
@@ -97,7 +97,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id0503200917103794" role="tablecontent" l10n="NEW">Stagnation Limit</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0504200917103794" role="tablecontent" l10n="NEW">Stagnation Limit</paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id050320091710377" role="tablecontent" l10n="NEW">If this number of individuals found solutions within a close range, the iteration is stopped and the best of these values is chosen as optimal.</paragraph>
@@ -165,7 +165,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id0603200910394232" role="tablecontent" l10n="NEW">PS: Social Constant</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0603200910394292" role="tablecontent" l10n="NEW">PS: Social Constant</paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id0603200910394284" role="tablecontent" l10n="NEW">… sets the importance of the global best point between all particles/individuals.</paragraph>
@@ -194,4 +194,4 @@
</table>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
commit 589315efd29941432e73ed43c0ada500944b708a
Author: Andras Timar <atimar at suse.com>
Date: Mon Nov 28 20:39:39 2011 +0100
enable l10n of nlpsolver
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 4969ba9..41f55eb 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -135,6 +135,7 @@ const char *ModuleList[] = {
"helpcontent2",
"instsetoo_native",
"mysqlc",
+ "nlpsolver",
"officecfg",
"padmin",
"readlicense_oo",
diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description.xml b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description.xml
index 45fdbd8..9289756 100644
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description.xml
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description.xml
@@ -4,13 +4,13 @@
<version value="0.9"/>
<identifier value="com.sun.star.comp.Calc.NLPSolver"/>
<display-name>
- <name lang="en">Solver for Nonlinear Programming</name>
+ <name lang="en-US">Solver for Nonlinear Programming</name>
</display-name>
<publisher>
- <name lang="en" xlink:href="http://www.documentfoundation.org">The Document Foundation</name>
+ <name lang="en-US" xlink:href="http://www.documentfoundation.org">The Document Foundation</name>
</publisher>
<extension-description>
- <src lang="en" xlink:href="description-en-US.txt"/>
+ <src lang="en-US" xlink:href="description-en-US.txt"/>
</extension-description>
<dependencies>
<OpenOffice.org-minimal-version xmlns:d="http://openoffice.org/extensions/description/2006" d:name="OpenOffice.org 3.0" value="3.0"/>
More information about the Libreoffice-commits
mailing list