Revision: 4464
Author: hans
URL: http://bknr.net/trac/changeset/4464
Update of english version.
U deployed/bos/projects/bos/payment-website/templates/en/contact.xml
U deployed/bos/projects/bos/payment-website/templates/en/disclaimer.xml
U deployed/bos/projects/bos/payment-website/templates/en/headline2.xml
U deployed/bos/projects/bos/payment-website/templates/en/headline3.xml
U deployed/bos/projects/bos/payment-website/templates/en/idea.xml
U deployed/bos/projects/bos/payment-website/templates/en/idea_subtitle1.xml
U deployed/bos/projects/bos/payment-website/templates/en/idea_subtitle2.xml
U deployed/bos/projects/bos/payment-website/templates/en/impressum.xml
U deployed/bos/projects/bos/payment-website/templates/en/index.xml
U deployed/bos/projects/bos/payment-website/templates/en/privacy.xml
Modified: deployed/bos/projects/bos/payment-website/templates/en/contact.xml
===================================================================
--- deployed/bos/projects/bos/payment-website/templates/en/contact.xml 2009-11-03 10:20:18 UTC (rev 4463)
+++ deployed/bos/projects/bos/payment-website/templates/en/contact.xml 2009-11-09 20:28:04 UTC (rev 4464)
@@ -77,7 +77,7 @@
</td>
</tr>
<tr>
- <td>On these webpages you will also find links to our BOS partner organisations worldwide.
+ <td>On these webpages you will also find links to the BOS supporting organisations worldwide.
</td>
</tr>
</table>
Modified: deployed/bos/projects/bos/payment-website/templates/en/disclaimer.xml
===================================================================
--- deployed/bos/projects/bos/payment-website/templates/en/disclaimer.xml 2009-11-03 10:20:18 UTC (rev 4463)
+++ deployed/bos/projects/bos/payment-website/templates/en/disclaimer.xml 2009-11-09 20:28:04 UTC (rev 4464)
@@ -13,12 +13,12 @@
<p><b>Disclaimer</b></p>
<p>
-Each sponsor of one or more square metres of renewable rainforest of the forestation
-and nature protection project Samboja Lestari/Borneo/ Indonesia has no claims or other
-rights to the respective land. No one is entitled to resell the land. Sponsors have no
-duties whatsoever. This is a mere symbolic act of an informative nature. BOS guarantees
-that the land will always be reserved for
-the benefit of sustainable nature,- and wildlife protection.
+No sponsor of one or more square metres of renewable rainforest of the forestation and nature protection project Samboja Lestari (Borneo, Indonesia)
+has any claims or other rights to the respective land. You help financing the lease respectively the concession of land, ecological reforestation,
+a nursery, ecological agriculture, sugar palm plantations, wages for Indonesian employees, surveillance and protection of the area, fire fighting,
+environmental education, infrastructure, research and arboretum, orangutan islands, and sunbear areas.
+With your donation you have no duties whatsoever. This is a mere symbolic act of an informative nature. BOS guarantees that the land will
+exclusively be reserved for the benefit of sustainable nature- and wildlife protection.
</p>
</p>
</bknr:toplevel>
Modified: deployed/bos/projects/bos/payment-website/templates/en/headline2.xml
===================================================================
--- deployed/bos/projects/bos/payment-website/templates/en/headline2.xml 2009-11-03 10:20:18 UTC (rev 4463)
+++ deployed/bos/projects/bos/payment-website/templates/en/headline2.xml 2009-11-09 20:28:04 UTC (rev 4464)
@@ -37,7 +37,8 @@
<td valign="top">
Nature conservation and the needs of the population must not be in conflict with each other.
<br /><br />
- The nature reserve Samboja Lestari offers a safe income, health and education to the local population. The people will be included into all phases of the project. Agriculture, nursery, production of compost, reforestation and the creation of infrastructure provide safe workplaces.
+ The nature reserve Samboja Lestari offers a safe income, health and education to the local population.
+Agriculture, nursery, production of compost, reforestation and the creation of infrastructure provide safe workplaces.
<br />
</td>
<td align="right" colspan="2"><img src="../images/pic_headline2_big.jpg" width="256" height="150" border="0" alt="" /></td>
@@ -76,7 +77,8 @@
</tr>
<tr>
<td colspan="3">
- The safety of the nature reserve is guaranteed by the acceptance through the Indonesian population. The success of the project guarantees a better standard of living and vice versa.
+ The safety of the nature reserve can be guaranteed in the long run only by the acceptance through the local people.
+The success of the project guarantees a better standard of living and vice versa.
</td>
</tr>
<tr><td height="16"></td></tr>
Modified: deployed/bos/projects/bos/payment-website/templates/en/headline3.xml
===================================================================
--- deployed/bos/projects/bos/payment-website/templates/en/headline3.xml 2009-11-03 10:20:18 UTC (rev 4463)
+++ deployed/bos/projects/bos/payment-website/templates/en/headline3.xml 2009-11-09 20:28:04 UTC (rev 4464)
@@ -40,9 +40,9 @@
great apes serves at the same time to preserve the rainforest's eco system.
<br /><br />
Nowadays, orangutans live only on Sumatra and Borneo. Massive rainforest destruction and unscrupulous pet trade could
- mean the end of their species. Malaysian bears are also in danger of losing their natural habitat. The nature reserve Samboja Lestari
- represents the last refuge for several animals - a last chance for their survival. Malaysian bears are already living in the reserve, in
- a specially set aside area. In a few years time also orangutans will be able to live there in freedom.
+ mean the end of their species. Sunbears are also in danger of losing their natural habitat. The nature reserve Samboja Lestari represents
+refuge for several species of animals - a chance for their survival. 52 sunbears are already living in a specially confined area. Infected orang-utans, unfit for realease,
+live on artificial islands. In the forest school young orang-utans train for their future release
<br /><br />
Rare species such as the Rhinoceros bird, the dwarf deer and the king cobra can already be observed in Samboja Lestari nowadays.
</td>
Modified: deployed/bos/projects/bos/payment-website/templates/en/idea.xml
===================================================================
--- deployed/bos/projects/bos/payment-website/templates/en/idea.xml 2009-11-03 10:20:18 UTC (rev 4463)
+++ deployed/bos/projects/bos/payment-website/templates/en/idea.xml 2009-11-09 20:28:04 UTC (rev 4464)
@@ -18,7 +18,7 @@
<span class="headline">
Samboja Lestari - Creative reforestation
<br />
- A sanctuary for Borneo
+ A sancutary for endangered species.
</span>
</td>
<td align="center"><img src="/images/pfeil_back.gif" width="10" height="9" alt="" />
@@ -35,8 +35,9 @@
<tr><td height="6"></td></tr>
<tr>
<td colspan="3">
- By means of a unique reforestation concept BOS is creating a sanctuary for orangutans, sunbears and other endangered species on Borneo -maybe the last one.
-Satellite pictures here on the internet make it possible to observe the progress of this concept.
+ BOS regenerates rainforest through an unique concept of afforestation and at the same time creates a sanctuary for
+orangutans, sunbears and other endangered species on Borneo.
+Satellite pictures here on the internet make it possible to observe the progress of this concept on this website and in Google Earth
<br /><br />
During the last decades the once species-rich rainforest of
<a href="/en/satmap" class="titlegreen">
@@ -44,7 +45,11 @@
</a>
was cleared and burnt down relentlessly.
Nutrient-consuming elephant grass took over completely. What remained was an ecological waste land.
-Nowadays it is already visible that this doesn't have to stay - since 2001 BOS is creating new rainforest. An innovative concept of reforestation and protection is changing this area of over 16 mio sqm into a natural habitat again. In tropical Borneo plants grow much faster than in Europe. Already within a few years the first orangutans can be released to share their freedom with other animals. A nature reserve is being created for the permanent use of humans, animals and plants in Samboja Lestari ("eternal Samboja").
+Nowadays it is already visible that this doesn't have to stay - since 2001 BOS is creating new rainforest.
+In the long term an innovative concept of reforestation and protection is converting this area of more than 18.5 mio sqm into a natural habitat again.
+In tropical Borneo plants grow much faster than in Europe.
+Already after a few years the first orangutans enjoy their new freedom on artificial islands. Young orang-utans train in the forest school of Samboja-Lestari for their future release.
+A nature reserve is being created for the permanent use of humans, animals and plants in Samboja Lestari ("eternal Samboja").
</td>
<td></td>
</tr>
Modified: deployed/bos/projects/bos/payment-website/templates/en/idea_subtitle1.xml
===================================================================
--- deployed/bos/projects/bos/payment-website/templates/en/idea_subtitle1.xml 2009-11-03 10:20:18 UTC (rev 4463)
+++ deployed/bos/projects/bos/payment-website/templates/en/idea_subtitle1.xml 2009-11-09 20:28:04 UTC (rev 4464)
@@ -60,13 +60,15 @@
<td colspan="2">
A <img src="/images/pfeil_link_on.gif" width="10" height="9" alt="" /> <a href="javascript:window_ringdetail();"
-class="content_green">circle of sugar-palm plantations</a> is being planted all around the nature reserve. Over 650 families will profit from the main product sugar. And - the circle forms a barrier against the much feared forest fires.
+class="content_green">circle of sugar-palm plantations</a> is being planted all around the nature reserve.
+Sugar as a main product is supposed to support hundreds of families in the future. And - the circle forms a barrier against the much feared forest fires.
<br /><br />
-A penetration of humans into the nature reserve, as well as the breakout of orangutans is prevented by an inner protection wall of thickly growing, prickly salac palms. Moreover, the fruit of these palms provides pleasant tasting food for humans and animals.
+An inner wall of thick thorny salak palms is supposed to prevent the intrusion of cattle into the nature reserve as well as the breakout of orangutans.
+Moreover, the fruit of these palms provides pleasant tasting food for humans and animals.
</td>
</tr>
<tr><td colspan="3">
-Ultra-light aeroplanes and modern satellite technique support the permanent surveillance of the BOS projects. Thus, slash-and-burn and illegal logging can be fought much more effectively.
+
</td>
</tr>
</table>
Modified: deployed/bos/projects/bos/payment-website/templates/en/idea_subtitle2.xml
===================================================================
--- deployed/bos/projects/bos/payment-website/templates/en/idea_subtitle2.xml 2009-11-03 10:20:18 UTC (rev 4463)
+++ deployed/bos/projects/bos/payment-website/templates/en/idea_subtitle2.xml 2009-11-09 20:28:04 UTC (rev 4464)
@@ -35,7 +35,9 @@
</tr>
<tr>
<td colspan="2">
- You help financing the purchase of land, ecological reforestation, a nursery, ecological agriculture, sugar palm plantations, wages for Indonesian employees, surveillance and protection of the area, fire fighting, environmental education, infrastructure, research and arboretum, orangutan islands and sunbear areas.
+ You help financing the lease and concession of land, ecological reforestation, a nursery,
+ecological agriculture, sugar palm plantations, wages for Indonesian employees, surveillance and protection of the area, fire fighting, environmental
+education, infrastructure, research and arboretum, orangutan islands and sunbear areas.
<br /><br />
Contribute to a better future and observe the development of the Samboja Lestari project on the internet.
</td>
Modified: deployed/bos/projects/bos/payment-website/templates/en/impressum.xml
===================================================================
--- deployed/bos/projects/bos/payment-website/templates/en/impressum.xml 2009-11-03 10:20:18 UTC (rev 4463)
+++ deployed/bos/projects/bos/payment-website/templates/en/impressum.xml 2009-11-09 20:28:04 UTC (rev 4464)
@@ -13,8 +13,7 @@
<p class="text_content">
<strong>www.create-rainforest.org </strong>is a webpage by:<br /><br />
- The Borneo Orangutan Survival Foundation (BOS) in collaboration with
- the partner organisation BOS Deutschland e.V.. <br /> <br />
+ BOS Deutschland e.V.. in collaboration with the Borneo Orangutan Survival Foundation (BOS) <br /> <br />
Postal address:<br /><br />
BOS Deutschland e.V.<br /><br />
@@ -36,7 +35,8 @@
<br /><br />
Chairman: Boris Thiemig<br />
Vice chairman: Maik Schaffer<br /><br />
- BOS Deutschland e.V. is registered under no. 24216 Nz. at the Amtsgericht Berlin-Charlottenburg (county court).<br /><br />
+ BOS Germany is officially registered under no. 502 VR 24216 B at the Amtsgericht (county court) Berlin Charlottenburg;
+exemption paper of the Finanzamt (tax office) in Kiel-Nord, no. GL5105.<br /><br />
The images on the webpage are protected by copyright, and are not freely available for
commercial purposes. If you wish to make use of BOS images,
please contact us under the above mentioned contact details. <br /><br />
Modified: deployed/bos/projects/bos/payment-website/templates/en/index.xml
===================================================================
--- deployed/bos/projects/bos/payment-website/templates/en/index.xml 2009-11-03 10:20:18 UTC (rev 4463)
+++ deployed/bos/projects/bos/payment-website/templates/en/index.xml 2009-11-09 20:28:04 UTC (rev 4464)
@@ -16,8 +16,8 @@
<tr>
<td colspan="3">
<a href="idea" class="titlegreen">
- Samboja Lestari - creative reforestation<br />
-A sanctuary for Borneo
+ Samboja - Lestari creative reforestation.<br />
+ A sanctuary for endangered species.
</a>
</td>
<td></td>
@@ -34,7 +34,8 @@
<tr><td height="6"></td></tr>
<tr>
<td colspan="3">
-By means of a unique reforestation concept BOS is creating a sanctuary for orangutans, sunbears and other endangered species on Borneo -maybe the last one. Satellite pictures here on the internet make it possible to observe the progress of this concept.
+By means of a unique reforestation concept BOS is creating a sanctuary for orangutans, sunbears and other endangered species on Borneo.
+You can watch the progress on this website and in Google Earth.
<br />
<a href="idea" class="more">
... more
Modified: deployed/bos/projects/bos/payment-website/templates/en/privacy.xml
===================================================================
--- deployed/bos/projects/bos/payment-website/templates/en/privacy.xml 2009-11-03 10:20:18 UTC (rev 4463)
+++ deployed/bos/projects/bos/payment-website/templates/en/privacy.xml 2009-11-09 20:28:04 UTC (rev 4464)
@@ -13,10 +13,10 @@
<p class="text_content">
<p>
The protection of your personal data via electronic processing is strictly regulated,
-and is something BOS Deutschland e.V. takes very seriously.BOS Deutschland e.V.
-is a renowned and not-for-profit foundation complying with the Bundesdatenschutzgesetz
-(German Privacy Policy Law). BOS is registered under no. 502 VR 4228 at the Amtsgericht (county court) in Kiel;
-exemption paper of the Finanzamt (tax office) in Kiel-Nord, no. GL5105.
+and is something BOS Deutschland e.V. takes very seriously.BOS Deutschland e.V. (BOS Germany) is an officially registered and eligible
+not-for-profit society complying with the Bundesdatenschutzgesetz (German Privacy Policy Law).
+BOS Germany is officially registered under no. 502 VR 24216 B at the Amtsgericht (county court) Berlin Charlottenburg; exemption paper of
+the Finanzamt (tax office) in Kiel-Nord, no. GL5105.
</p>
<p>
<b>What happens with your personal data?</b>
Revision: 4463
Author: edi
URL: http://bknr.net/trac/changeset/4463
Rename "server" to "acceptor" in documentation
U trunk/thirdparty/hunchentoot/doc/index.xml
Modified: trunk/thirdparty/hunchentoot/doc/index.xml
===================================================================
--- trunk/thirdparty/hunchentoot/doc/index.xml 2009-10-29 15:01:32 UTC (rev 4462)
+++ trunk/thirdparty/hunchentoot/doc/index.xml 2009-11-03 10:20:18 UTC (rev 4463)
@@ -908,7 +908,7 @@
<a href="http://www.lispworks.com/documentation/HyperSpec/Body/03_de.htm">destructuring
lambda list</a>
</p>
- <pre>(name &key uri server-names default-parameter-type default-request-type).</pre>
+ <pre>(name &key uri acceptor-names default-parameter-type default-request-type).</pre>
<clix:arg>lambda-list</clix:arg> is a list the elements of which
are either a symbol <clix:arg>var</clix:arg> or a list matching
the destructuring lambda list
@@ -939,14 +939,14 @@
object</a> returns a true value.
</p>
<p>
- <clix:arg>server-names</clix:arg> (which is evaluated) can be a
+ <clix:arg>acceptor-names</clix:arg> (which is evaluated) can be a
list of symbols which means that the handler will only be
returned by <clix:ref>DISPATCH-EASY-HANDLERS</clix:ref> in
- servers which have one of these names
- (see <clix:ref>SERVER-NAME</clix:ref>). <clix:arg>server-names</clix:arg> can also be the
+ acceptors which have one of these names
+ (see <clix:ref>ACCEPTOR-NAME</clix:ref>). <clix:arg>acceptor-names</clix:arg> can also be the
symbol <code>T</code> which means that the handler will be
returned by <clix:ref>DISPATCH-EASY-HANDLERS</clix:ref>
- in <em>every</em> server.
+ in <em>every</em> acceptor.
</p>
<p>
Whether the GET or POST parameter (or both) will be taken into
Revision: 4459
Author: edi
URL: http://bknr.net/trac/changeset/4459
Typos
U trunk/thirdparty/hunchentoot/easy-handlers.lisp
U trunk/thirdparty/hunchentoot/specials.lisp
Modified: trunk/thirdparty/hunchentoot/easy-handlers.lisp
===================================================================
--- trunk/thirdparty/hunchentoot/easy-handlers.lisp 2009-10-14 21:45:48 UTC (rev 4458)
+++ trunk/thirdparty/hunchentoot/easy-handlers.lisp 2009-10-14 21:51:47 UTC (rev 4459)
@@ -184,7 +184,7 @@
ACCEPTOR-NAMES \(which is evaluated) can be a list of symbols which
means that the handler will be returned by DISPATCH-EASY-HANDLERS in
-acceptor which have one of these names \(see ACCEPTOR-NAME).
+acceptors which have one of these names \(see ACCEPTOR-NAME).
ACCEPTOR-NAMES can also be the symbol T which means that the handler
will be returned by DISPATCH-EASY-HANDLERS in every acceptor.
Modified: trunk/thirdparty/hunchentoot/specials.lisp
===================================================================
--- trunk/thirdparty/hunchentoot/specials.lisp 2009-10-14 21:45:48 UTC (rev 4458)
+++ trunk/thirdparty/hunchentoot/specials.lisp 2009-10-14 21:51:47 UTC (rev 4459)
@@ -270,7 +270,7 @@
DEFAULT-DISPATCHER.")
(defvar *easy-handler-alist* nil
- "An alist of \(URI server-names function) lists defined by
+ "An alist of \(URI acceptor-names function) lists defined by
DEFINE-EASY-HANDLER.")
(defvar *http-error-handler* nil